[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.42-59-gc28b2f1

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit df44901e2be66335cb048a431a957fbf45a10873
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Mar 5 17:57:36 2012 +0100

    split Section.run() method
    
    simplify error handling by separating chdir, locking, ...
    from talking to the master and actually running piuparts
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 8366d8c..1fd2dd9 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -292,11 +292,17 @@ class Section:
         logging.info("Running section %s (precedence=%d)" % (self._config.section, self.precedence()))
         self._config = Config(section=self._config.section)
         self._config.read(CONFIG_FILE)
-        self._slave.connect_to_master(self._log_file)
 
         oldcwd = os.getcwd()
         os.chdir(self._slave_directory)
-        test_count = 0
+
+        ret = self._run()
+
+        os.chdir(oldcwd)
+        return ret
+
+    def _run(self):
+        self._slave.connect_to_master(self._log_file)
 
         for logdir in ["pass", "fail", "untestable"]:
             for basename in os.listdir(logdir):
@@ -313,6 +319,7 @@ class Section:
         self._slave.get_status(self._config.section)
         self._slave.close()
 
+        test_count = 0
         if self._slave.get_reserved():
             self._check_tarball()
             packages_files = {}
@@ -347,8 +354,6 @@ class Section:
                                 log_name(package_name, version)),
                                 "Package %s not found" % package_name)
                 self._slave.forget_reserved(package_name, version)
-
-        os.chdir(oldcwd)
         return test_count
 
 

-- 
piuparts git repository