Bug 921632 - Re-enable delayed kill broad mozprocess unit test.
MozReview-Commit-ID: 93KwNlw84ld
--- a/testing/mozbase/mozprocess/tests/manifest.ini
+++ b/testing/mozbase/mozprocess/tests/manifest.ini
@@ -4,16 +4,14 @@
[DEFAULT]
# bug https://bugzilla.mozilla.org/show_bug.cgi?id=778267#c26
skip-if = (os == "win")
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]
[test_mozprocess_output.py]
[test_mozprocess_params.py]
[test_process_reader.py]
--- a/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py
+++ b/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py
@@ -66,16 +66,30 @@ class ProcTestKill(proctest.ProcTest):
p = processhandler.ProcessHandler([self.python, self.proclaunch,
"process_normal_broad_python.ini"],
cwd=here)
p.run()
p.kill()
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')
p = processhandler.ProcessHandler([self.python, script])
p.run()
p.kill()
deleted file mode 100644
--- 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()