diff --git a/testing/mozbase/mozprocess/tests/manifest.ini b/testing/mozbase/mozprocess/tests/manifest.ini index 144c9a923158..b57ecde835af 100644 --- a/testing/mozbase/mozprocess/tests/manifest.ini +++ b/testing/mozbase/mozprocess/tests/manifest.ini @@ -6,10 +6,10 @@ skip-if = (os == "win") subsuite = mozbase, os == "linux" -[test_mozprocess_kill.py] -[test_mozprocess_misc.py] -[test_mozprocess_poll.py] -[test_mozprocess_wait.py] -[test_mozprocess_output.py] -[test_mozprocess_params.py] +[test_kill.py] +[test_misc.py] +[test_poll.py] +[test_wait.py] +[test_output.py] +[test_params.py] [test_process_reader.py] diff --git a/testing/mozbase/mozprocess/tests/process_normal_broad_python.ini b/testing/mozbase/mozprocess/tests/process_normal_broad.ini similarity index 100% rename from testing/mozbase/mozprocess/tests/process_normal_broad_python.ini rename to testing/mozbase/mozprocess/tests/process_normal_broad.ini diff --git a/testing/mozbase/mozprocess/tests/process_normal_deep_python.ini b/testing/mozbase/mozprocess/tests/process_normal_deep.ini similarity index 100% rename from testing/mozbase/mozprocess/tests/process_normal_deep_python.ini rename to testing/mozbase/mozprocess/tests/process_normal_deep.ini diff --git a/testing/mozbase/mozprocess/tests/process_normal_finish_python.ini b/testing/mozbase/mozprocess/tests/process_normal_finish.ini similarity index 100% rename from testing/mozbase/mozprocess/tests/process_normal_finish_python.ini rename to testing/mozbase/mozprocess/tests/process_normal_finish.ini diff --git a/testing/mozbase/mozprocess/tests/process_waittimeout_python.ini b/testing/mozbase/mozprocess/tests/process_waittimeout.ini similarity index 100% rename from testing/mozbase/mozprocess/tests/process_waittimeout_python.ini rename to testing/mozbase/mozprocess/tests/process_waittimeout.ini diff --git a/testing/mozbase/mozprocess/tests/process_waittimeout_10s_python.ini b/testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini similarity index 100% rename from testing/mozbase/mozprocess/tests/process_waittimeout_10s_python.ini rename to testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini diff --git a/testing/mozbase/mozprocess/tests/infinite_loop.py b/testing/mozbase/mozprocess/tests/scripts/infinite_loop.py similarity index 100% rename from testing/mozbase/mozprocess/tests/infinite_loop.py rename to testing/mozbase/mozprocess/tests/scripts/infinite_loop.py diff --git a/testing/mozbase/mozprocess/tests/proccountfive.py b/testing/mozbase/mozprocess/tests/scripts/proccountfive.py similarity index 100% rename from testing/mozbase/mozprocess/tests/proccountfive.py rename to testing/mozbase/mozprocess/tests/scripts/proccountfive.py diff --git a/testing/mozbase/mozprocess/tests/procnonewline.py b/testing/mozbase/mozprocess/tests/scripts/procnonewline.py similarity index 100% rename from testing/mozbase/mozprocess/tests/procnonewline.py rename to testing/mozbase/mozprocess/tests/scripts/procnonewline.py diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py b/testing/mozbase/mozprocess/tests/test_kill.py similarity index 91% rename from testing/mozbase/mozprocess/tests/test_mozprocess_kill.py rename to testing/mozbase/mozprocess/tests/test_kill.py index 1a1c1447aeff..69e6bdd5fb3a 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_kill.py +++ b/testing/mozbase/mozprocess/tests/test_kill.py @@ -28,7 +28,7 @@ class ProcTestKill(proctest.ProcTest): """Process is started, we kill it""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() p.kill() @@ -39,7 +39,7 @@ class ProcTestKill(proctest.ProcTest): """Process is started, we kill it, we use a deep process tree""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_deep_python.ini"], + "process_normal_deep.ini"], cwd=here) p.run() p.kill() @@ -51,7 +51,7 @@ class ProcTestKill(proctest.ProcTest): for a bit, we kill it""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_deep_python.ini"], + "process_normal_deep.ini"], cwd=here) p.run() # Let the tree spawn a bit, before attempting to kill @@ -64,7 +64,7 @@ class ProcTestKill(proctest.ProcTest): """Process is started, we kill it, we use a broad process tree""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_broad_python.ini"], + "process_normal_broad.ini"], cwd=here) p.run() p.kill() @@ -76,7 +76,7 @@ class ProcTestKill(proctest.ProcTest): for a bit, we kill it""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_broad_python.ini"], + "process_normal_broad.ini"], cwd=here) p.run() # Let the tree spawn a bit, before attempting to kill @@ -87,7 +87,7 @@ class ProcTestKill(proctest.ProcTest): @unittest.skipUnless(processhandler.isPosix, "posix only") def test_process_kill_with_sigterm(self): - script = os.path.join(here, 'infinite_loop.py') + script = os.path.join(here, 'scripts', 'infinite_loop.py') p = processhandler.ProcessHandler([self.python, script]) p.run() @@ -97,7 +97,7 @@ class ProcTestKill(proctest.ProcTest): @unittest.skipUnless(processhandler.isPosix, "posix only") def test_process_kill_with_sigint_if_needed(self): - script = os.path.join(here, 'infinite_loop.py') + script = os.path.join(here, 'scripts', 'infinite_loop.py') p = processhandler.ProcessHandler([self.python, script, 'deadlock']) p.run() diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py b/testing/mozbase/mozprocess/tests/test_misc.py similarity index 93% rename from testing/mozbase/mozprocess/tests/test_mozprocess_misc.py rename to testing/mozbase/mozprocess/tests/test_misc.py index 16bb897da043..fbf0df19a4f5 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py +++ b/testing/mozbase/mozprocess/tests/test_misc.py @@ -26,7 +26,7 @@ class ProcTestMisc(proctest.ProcTest): self.assertEqual(p.proc.poll(), None) p.kill() p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_python.ini"], + "process_waittimeout.ini"], cwd=here, onTimeout=(timeout_handler,), kill_on_timeout=False) @@ -41,7 +41,7 @@ class ProcTestMisc(proctest.ProcTest): 'FOOBAR': 'ʘ', } p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here, env=env) # passes if no exceptions are raised p.run() diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_output.py b/testing/mozbase/mozprocess/tests/test_output.py similarity index 88% rename from testing/mozbase/mozprocess/tests/test_mozprocess_output.py rename to testing/mozbase/mozprocess/tests/test_output.py index 4291132b91c1..5f9be26bd449 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_output.py +++ b/testing/mozbase/mozprocess/tests/test_output.py @@ -21,7 +21,7 @@ class ProcTestOutput(proctest.ProcTest): Process is started, then processOutput is called a second time explicitly """ p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_10s_python.ini"], + "process_waittimeout_10s.ini"], cwd=here) p.run() @@ -34,7 +34,7 @@ class ProcTestOutput(proctest.ProcTest): """ Process is started, outputs data with no newline """ - p = processhandler.ProcessHandler([self.python, "procnonewline.py"], + p = processhandler.ProcessHandler([self.python, "scripts", "procnonewline.py"], cwd=here) p.run() @@ -52,7 +52,8 @@ class ProcTestOutput(proctest.ProcTest): stream = io.BytesIO() buf = io.BufferedRandom(stream) - p = processhandler.ProcessHandler([self.python, "proccountfive.py"], + p = processhandler.ProcessHandler([self.python, + os.path.join("scripts", "proccountfive.py")], cwd=here, stream=buf) diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_params.py b/testing/mozbase/mozprocess/tests/test_params.py similarity index 100% rename from testing/mozbase/mozprocess/tests/test_mozprocess_params.py rename to testing/mozbase/mozprocess/tests/test_params.py diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_poll.py b/testing/mozbase/mozprocess/tests/test_poll.py similarity index 97% rename from testing/mozbase/mozprocess/tests/test_mozprocess_poll.py rename to testing/mozbase/mozprocess/tests/test_poll.py index 63f810438747..1ab348dc5cf6 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_poll.py +++ b/testing/mozbase/mozprocess/tests/test_poll.py @@ -22,7 +22,7 @@ class ProcTestPoll(proctest.ProcTest): """Process is not started, and poll() is called""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) self.assertRaises(RuntimeError, p.poll) @@ -30,7 +30,7 @@ class ProcTestPoll(proctest.ProcTest): """Process is started, and poll() is called""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() returncode = p.poll() @@ -44,7 +44,7 @@ class ProcTestPoll(proctest.ProcTest): """Process is killed, and poll() is called""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() returncode = p.kill() @@ -76,7 +76,7 @@ class ProcTestPoll(proctest.ProcTest): """Process is killed twice, and poll() is called""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() p.kill() @@ -92,7 +92,7 @@ class ProcTestPoll(proctest.ProcTest): """Process is killed externally, and poll() is called""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() os.kill(p.pid, signal.SIGTERM) diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_wait.py b/testing/mozbase/mozprocess/tests/test_wait.py similarity index 93% rename from testing/mozbase/mozprocess/tests/test_mozprocess_wait.py rename to testing/mozbase/mozprocess/tests/test_wait.py index 97d2655bf397..24e886b282ea 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_wait.py +++ b/testing/mozbase/mozprocess/tests/test_wait.py @@ -20,7 +20,7 @@ class ProcTestWait(proctest.ProcTest): """Process is started, runs to completion while we wait for it""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_normal_finish_python.ini"], + "process_normal_finish.ini"], cwd=here) p.run() p.wait() @@ -31,7 +31,7 @@ class ProcTestWait(proctest.ProcTest): """Process is started runs to completion while we wait indefinitely""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_10s_python.ini"], + "process_waittimeout_10s.ini"], cwd=here) p.run() p.wait() @@ -43,7 +43,7 @@ class ProcTestWait(proctest.ProcTest): to complete """ p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_python.ini"], + "process_waittimeout.ini"], cwd=here) p.run(timeout=10) p.wait() @@ -60,7 +60,7 @@ class ProcTestWait(proctest.ProcTest): Process is still running and didn't timeout """ p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_10s_python.ini"], + "process_waittimeout_10s.ini"], cwd=here) p.run() @@ -72,7 +72,7 @@ class ProcTestWait(proctest.ProcTest): """ Process is started, runs to completion before our wait times out """ p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_10s_python.ini"], + "process_waittimeout_10s.ini"], cwd=here) p.run(timeout=30) p.wait() @@ -82,7 +82,7 @@ class ProcTestWait(proctest.ProcTest): def test_wait_twice_after_kill(self): """Bug 968718: Process is started and stopped. wait() twice afterward.""" p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_python.ini"], + "process_waittimeout.ini"], cwd=here) p.run() p.kill()