Register signals only if on MainThread.

Also removed possibility to disable registering signal handlers.

Author: pekkaklarck

src/robotremoteserver.py

@@ -90,13 +90,9 @@ def _register_functions(self, server):
         server.register_function(self.get_keyword_documentation)
         server.register_function(self.stop_serve, 'stop_remote_server')
 
-    def serve(self, stop_with_signals=True, log=True):
+    def serve(self, log=True):
         """Start the server and wait for it to finish.
 
-        :param stop_with_signals:  Controls should INT, TERM and HUP signals be
-                     registered to stop serving. Can be disabled, for example,
-                     if running this method on a thread where registering
-                     signals is not possible.
         :param log:  Log message about startup or not.
 
         Using this requires using ``serve=False`` when creating initializing
@@ -110,7 +106,7 @@ def serve(self, stop_with_signals=True, log=True):
         is initialized. Calling :meth:`force_stop_serve` stops the server
         unconditionally.
         """
-        self._server.serve(stop_with_signals, log)
+        self._server.serve(log=log)
 
     def stop_serve(self, log=True):
         """Stop the server started by :meth:`serve`.
@@ -216,22 +212,25 @@ def _announce_end(self, log_end, port_file):
         if port_file and os.path.exists(port_file):
             os.remove(port_file)    # TODO: Document that port file is removed
 
-    def serve(self, stop_with_signals=True, log=True):
+    def serve(self, log=True):
         self._stop_serve = threading.Event()
-        with self._stop_signals(stop_with_signals):
+        with self._stop_signals():
             self.start(log)
             while not self._stop_serve.is_set():
                 self._stop_serve.wait(1)
             self._stop_serve = None
             self.stop(log)
 
     @contextmanager
-    def _stop_signals(self, stop_with_signals=True):
+    def _stop_signals(self):
         original = {}
-        handler = lambda signum, frame: self.stop_serve()
-        for name in 'SIGINT', 'SIGTERM', 'SIGHUP':
-            if stop_with_signals and hasattr(signal, name):
-                original[name] = signal.signal(getattr(signal, name), handler)
+        stop = lambda signum, frame: self.stop_serve()
+        try:
+            for name in 'SIGINT', 'SIGTERM', 'SIGHUP':
+                if hasattr(signal, name):
+                    original[name] = signal.signal(getattr(signal, name), stop)
+        except ValueError:  # Not in main thread
+            pass
         try:
             yield
         finally:

test/utest/test_interactive.py

@@ -11,7 +11,7 @@
 
 class Library(object):
 
-    def keyword(self):
+    def kw(self):
         return 42
 
 
@@ -25,17 +25,17 @@ def test_serve(self):
         with self._server_thread():
             uri = self._wait_until_started()
             try:
-                self.assertEqual(Remote(uri).run_keyword('keyword', (), None), 42)
+                self.assertEqual(Remote(uri).run_keyword('kw', (), None), 42)
             finally:
                 self.assertEqual(self.server.stop_serve(log=False), True)
             self._wait_until_stopped(uri)
             self.assertEqual(self.server.stop_serve(log=False), True)
             self.assertEqual(test_remote_server(uri, log=False), False)
 
     @contextmanager
-    def _server_thread(self, server=None):
+    def _server_thread(self):
         thread = threading.Thread(target=self.server.serve,
-                                  kwargs={'stop_with_signals': False, 'log': False})
+                                  kwargs={'log': False})
         thread.start()
         try:
             yield
@@ -64,7 +64,7 @@ def test_start_and_stop(self):
         self.server.start()
         uri = 'http://%s:%s' % self.server.server_address
         try:
-            self.assertEqual(Remote(uri).run_keyword('keyword', (), None), 42)
+            self.assertEqual(Remote(uri).run_keyword('kw', (), None), 42)
         finally:
             self.server.stop()
         self.assertEqual(test_remote_server(uri, log=False), False)
@@ -79,7 +79,7 @@ def test_stop_remote_server_works_with_serve(self):
 
     def test_stop_remote_server_can_be_disabled_with_serve(self):
         self.server = RobotRemoteServer(Library(), port=0, serve=False,
-                                       allow_stop=False)
+                                        allow_stop=False)
         with self._server_thread():
             uri = self._wait_until_started()
             self.assertEqual(test_remote_server(uri, log=False), True)