From 96ed8b8cf52a10ed686f5a2f1f876df94fbd293c Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Mon, 5 Feb 2018 15:16:48 +0100
Subject: [PATCH] Bug 921632 - Re-enable delayed kill broad mozprocess unit
 test. r=ahal

MozReview-Commit-ID: 93KwNlw84ld

--HG--
extra : rebase_source : fd96ee848ea3b4211db338f6f337372901fff210
---
 testing/mozbase/mozprocess/tests/manifest.ini |  2 -
 .../mozprocess/tests/test_mozprocess_kill.py  | 14 +++++++
 .../tests/test_mozprocess_kill_broad_wait.py  | 38 -------------------
 3 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py

diff --git a/testing/mozbase/mozprocess/tests/manifest.ini b/testing/mozbase/mozprocess/tests/manifest.ini
index 576ece050511..818b9ed49d61 100644
--- a/testing/mozbase/mozprocess/tests/manifest.ini
+++ b/testing/mozbase/mozprocess/tests/manifest.ini
@@ -9,8 +9,6 @@ subsuite = mozbase, os == "linux"
 [test_mozprocess.py]
 disabled = bug 877864
 [test_mozprocess_kill.py]
-[test_mozprocess_kill_broad_wait.py]
-disabled = bug 921632
 [test_mozprocess_misc.py]
 [test_mozprocess_poll.py]
 [test_mozprocess_wait.py]
diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py b/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py
index 17474dde1f00..1a1c1447aeff 100644
--- a/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py
+++ b/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py
@@ -71,6 +71,20 @@ class ProcTestKill(proctest.ProcTest):
 
         self.determine_status(p, expectedfail=('returncode',))
 
+    def test_process_kill_broad_delayed(self):
+        """Process is started, we use a broad process tree, we let it spawn
+           for a bit, we kill it"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                           "process_normal_broad_python.ini"],
+                                          cwd=here)
+        p.run()
+        # Let the tree spawn a bit, before attempting to kill
+        time.sleep(3)
+        p.kill()
+
+        self.determine_status(p, expectedfail=('returncode',))
+
     @unittest.skipUnless(processhandler.isPosix, "posix only")
     def test_process_kill_with_sigterm(self):
         script = os.path.join(here, 'infinite_loop.py')
diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py b/testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py
deleted file mode 100644
index 3d357d4b0244..000000000000
--- a/testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import absolute_import
-
-import os
-import time
-import proctest
-
-import mozunit
-
-from mozprocess import processhandler
-
-here = os.path.dirname(os.path.abspath(__file__))
-
-
-class ProcTestKill(proctest.ProcTest):
-    """ Class to test various process tree killing scenatios """
-
-    # This test should ideally be a part of test_mozprocess_kill.py
-    # It has been separated for the purpose of tempporarily disabling it.
-    # See https://bugzilla.mozilla.org/show_bug.cgi?id=921632
-    def test_process_kill_broad_wait(self):
-        """Process is started, we use a broad process tree, we let it spawn
-           for a bit, we kill it"""
-
-        p = processhandler.ProcessHandler([self.python, self.proclaunch,
-                                           "process_normal_broad_python.ini"],
-                                          cwd=here)
-        p.run()
-        # Let the tree spawn a bit, before attempting to kill
-        time.sleep(3)
-        p.kill()
-
-        self.determine_status(p, expectedfail=('returncode',))
-
-
-if __name__ == '__main__':
-    mozunit.main()