Use coroutine friendly singnals

3 files changed, 10 insertions, 10 deletions

diff --git a/sugar_network/toolkit/application.py b/sugar_network/toolkit/application.py
index 520583c..c055ab8 100644
--- a/sugar_network/toolkit/application.py
+++ b/sugar_network/toolkit/application.py
@@ -25,7 +25,7 @@ from optparse import OptionParser
 from os.path import join, abspath, exists, basename
 from gettext import gettext as _
 
-from sugar_network.toolkit import Option, printf, enforce
+from sugar_network.toolkit import Option, coroutine, printf, enforce
 
 
 debug = Option(
@@ -332,17 +332,17 @@ class Daemon(Application):
     def _launch(self):
         logging.info('Start %s', self.name)
 
-        def sigterm_cb(signum, frame):
+        def sigterm_cb(signum):
             logging.info('Got signal %s to stop %s', signum, self.name)
             self.shutdown()
 
-        def sighup_cb(signum, frame):
+        def sighup_cb():
             logging.info('Reload %s on SIGHUP signal', self.name)
             self._keep_stdout()
 
-        signal.signal(signal.SIGINT, sigterm_cb)
-        signal.signal(signal.SIGTERM, sigterm_cb)
-        signal.signal(signal.SIGHUP, sighup_cb)
+        coroutine.signal(signal.SIGINT, sigterm_cb, signal.SIGINT)
+        coroutine.signal(signal.SIGTERM, sigterm_cb, signal.SIGTERM)
+        coroutine.signal(signal.SIGHUP, sighup_cb)
 
         pid_path = self.new_instance()
         try:
diff --git a/tests/__init__.py b/tests/__init__.py
index 9c48d60..5709c70 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -257,7 +257,7 @@ class Test(unittest.TestCase):
         cp = MasterCommands('guid', self.node_volume)
         self.node = coroutine.WSGIServer(('localhost', 8888), Router(cp))
         coroutine.spawn(self.node.serve_forever)
-        coroutine.dispatch()
+        coroutine.dispatch(.1)
         return self.node_volume
 
     def start_online_client(self, classes=None):
diff --git a/tests/units/client/commands.py b/tests/units/client/commands.py
index 54ff7fe..39ace93 100755
--- a/tests/units/client/commands.py
+++ b/tests/units/client/commands.py
@@ -181,7 +181,7 @@ class CommandsTest(tests.Test):
 
         trigger = self.wait_for_events(cp, event='inline', state='online')
         node_volume = self.start_master()
-        cp.call(db.Request(method='GET', cmd='whoami'))
+        cp.call(db.Request(method='GET', cmd='inline'))
         trigger.wait()
 
         guid = cp.call(post)
@@ -247,7 +247,7 @@ class CommandsTest(tests.Test):
 
         trigger = self.wait_for_events(cp, event='push')
         self.start_master([User, Report])
-        cp.call(db.Request(method='GET', cmd='whoami'))
+        cp.call(db.Request(method='GET', cmd='inline'))
         trigger.wait()
 
         assert not volume['report'].exists(guid)
@@ -271,7 +271,7 @@ class CommandsTest(tests.Test):
 
         trigger = self.wait_for_events(cp, event='inline', state='online')
         self.start_master()
-        cp.call(db.Request(method='GET', cmd='whoami'))
+        cp.call(db.Request(method='GET', cmd='inline'))
         trigger.wait()
 
         assert not self.node_volume['context'].exists(guid)