diff -r 000000000000 -r 6474c204b198 testing/mozbase/mozprocess/tests/test_mozprocess_poll.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testing/mozbase/mozprocess/tests/test_mozprocess_poll.py	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,127 @@
+#!/usr/bin/env python
+
+import os
+import signal
+import unittest
+
+import mozinfo
+from mozprocess import processhandler
+
+import proctest
+
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+
+class ProcTestPoll(proctest.ProcTest):
+    """ Class to test process poll """
+
+    def test_poll_before_run(self):
+        """Process is not started, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_python.ini"],
+                                          cwd=here)
+        self.assertRaises(AttributeError, p.poll)
+
+    def test_poll_while_running(self):
+        """Process is started, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_python.ini"],
+                                          cwd=here)
+        p.run()
+        returncode = p.poll()
+
+        self.assertEqual(returncode, None)
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              returncode,
+                              p.didTimeout,
+                              True)
+        p.kill()
+
+    def test_poll_after_kill(self):
+        """Process is killed, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_python.ini"],
+                                          cwd=here)
+        p.run()
+        returncode = p.kill()
+
+        # We killed the process, so the returncode should be < 0
+        self.assertLess(returncode, 0)
+        self.assertEqual(returncode, p.poll())
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              returncode,
+                              p.didTimeout)
+
+    def test_poll_after_kill_no_process_group(self):
+        """Process (no group) is killed, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_no_process_group.ini"],
+                                          cwd=here,
+                                          ignore_children=True
+                                          )
+        p.run()
+        returncode = p.kill()
+
+        # We killed the process, so the returncode should be < 0
+        self.assertLess(returncode, 0)
+        self.assertEqual(returncode, p.poll())
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              returncode,
+                              p.didTimeout)
+
+    def test_poll_after_double_kill(self):
+        """Process is killed twice, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_python.ini"],
+                                          cwd=here)
+        p.run()
+        p.kill()
+        returncode = p.kill()
+
+        # We killed the process, so the returncode should be < 0
+        self.assertLess(returncode, 0)
+        self.assertEqual(returncode, p.poll())
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              returncode,
+                              p.didTimeout)
+
+    def test_poll_after_external_kill(self):
+        """Process is killed externally, and poll() is called"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch,
+                                          "process_normal_finish_python.ini"],
+                                          cwd=here)
+        p.run()
+        os.kill(p.pid, signal.SIGTERM)
+        returncode = p.wait()
+
+        # We killed the process, so the returncode should be < 0
+        self.assertEqual(returncode, -signal.SIGTERM)
+        self.assertEqual(returncode, p.poll())
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              returncode,
+                              p.didTimeout)
+
+if __name__ == '__main__':
+    unittest.main()