[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.46-31-g489e751

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 18fe3a496f673f44da4f868b62490164f3481537
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Sep 19 08:11:49 2012 +0200

    p-s: detect incomplete piuparts output
    
    make logs missing the magic final line 'piuparts run ends' fail
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index cb9a24d..1e2c8a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ piuparts (0.47) UNRELEASED; urgency=low
     - Print a final message before terminating in the panic() handler.
   * piuparts-master.py:
   * piuparts-slave.py:
+    - Detect incomplete piuparts output and ensure such tests fail.
   * piuparts-report.py:
     - Rewrite find_files_with_suffix(), handle disappearing files.
   * New custom script pre_remove_50_find_missing_copyright: check for missing
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 53b8935..aedda59 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -664,8 +664,12 @@ def test_package(config, package, packages_files):
         if not f or f[-1] != '\n':
             f += '\n'
         output.write(f)
+        lastline = f.split('\n')[-2]
         if ret < 0:
             output.write(" *** Process KILLED - exceed maximum run time ***\n")
+        elif not "piuparts run ends" in lastline:
+            ret += 1024
+            output.write(" *** PIUPARTS OUTPUT INCOMPLETE ***\n");
 
     if ret == 0 and config["upgrade-test-chroot-tgz"] and upgrade_testable(config, package, packages_files):
         command = base_command[:]
@@ -679,8 +683,12 @@ def test_package(config, package, packages_files):
         if not f or f[-1] != '\n':
             f += '\n'
         output.write(f)
+        lastline = f.split('\n')[-2]
         if ret < 0:
             output.write(" *** Process KILLED - exceed maximum run time ***\n")
+        elif not "piuparts run ends" in lastline:
+            ret += 1024
+            output.write(" *** PIUPARTS OUTPUT INCOMPLETE ***\n");
 
     output.write("\n")
     output.write("ret=%d\n" % ret)

-- 
piuparts git repository