Merge branch 'promises' of https://git.erp5.org/repos/slapos.core into promises

slapos/tests/slapgrid.py

@@ -36,6 +36,15 @@ class BasicMixin:
       self.buildout)
 
   def tearDown(self):
+    # XXX: Hardcoded pid, as it is not configurable in slapos
+    svc = os.path.join(self.instance_root, 'var', 'run', 'supervisord.pid')
+    if os.path.exists(svc):
+      try:
+        pid = int(open(svc).read().strip())
+      except ValueError:
+        pass
+      else:
+        os.kill(pid, signal.SIGTERM)
     shutil.rmtree(self._tempdir, True)
 
 class TestBasicSlapgridCP(BasicMixin, unittest.TestCase):
@@ -99,15 +108,6 @@ touch worked""")
 
   def tearDown(self):
     self._unpatchHttplib()
-    # XXX: Hardcoded pid, as it is not configurable in slapos
-    svc = os.path.join(self.instance_root, 'var', 'run', 'supervisord.pid')
-    if os.path.exists(svc):
-      try:
-        pid = int(open(svc).read().strip())
-      except ValueError:
-        pass
-      else:
-        os.kill(pid, signal.SIGTERM)
     BasicMixin.tearDown(self)
 
 class TestSlapgridCPWithMaster(MasterMixin, unittest.TestCase):
@@ -329,13 +329,14 @@ chmod 755 etc/run/wrapper
     self.assertSortedListEqual(os.listdir(partition_path), ['.0_wrapper.log',
       '.0_wrapper.log.1', 'worked', 'buildout.cfg', 'etc'])
     tries = 10
+    expected_text = 'Signal handler called with signal 15'
     while tries > 0:
       tries -= 1
-      if os.path.getsize(wrapper_log) > last_size:
+      found = expected_text in open(wrapper_log, 'r').read()
+      if found:
         break
       time.sleep(0.2)
-    self.assertTrue('Signal handler called with signal 15' in
-      open(wrapper_log, 'r').read())
+    self.assertTrue(found)
 
   def test_one_partition_stopped_started(self):