Revert "src/linux/integration-test: Do not crash on absent _outcomeForDoCleanups"

This reverts commit 14761c09d27934188829e3c804aca6593757ed9b.

The real reason for the failure is that Makefile.am calls the script with
"python" which is Python 2, but we need Python 3.

1 files changed, 5 insertions, 12 deletions

diff --git a/src/linux/integration-test b/src/linux/integration-test
index 871d5e8..cc2b329 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -88,18 +88,11 @@ class Tests(unittest.TestCase):
         shutil.rmtree(self.sysfs)
 
         # on failures, print daemon log
-        try:
-            if self._outcomeForDoCleanups.success:
-                return
-        except AttributeError:
-            # _outcomeForDoCleanups is a private member which seems to be a bit
-            # unreliable; if it does not exist, just ignore it
-            return
-
-        with open(self.log.name) as f:
-            sys.stderr.write('\n-------------- daemon log: ----------------\n')
-            sys.stderr.write(f.read())
-            sys.stderr.write('------------------------------\n')
+        if not self._outcomeForDoCleanups.success:
+            with open(self.log.name) as f:
+                sys.stderr.write('\n-------------- daemon log: ----------------\n')
+                sys.stderr.write(f.read())
+                sys.stderr.write('------------------------------\n')
 
     #
     # Methods for fake sysfs