Try to fix stalling tests

supysonic/daemon/server.py

@@ -106,8 +106,8 @@ class Daemon:
             self.__watcher.remove_folder(folder.path)
 
     def terminate(self):
-        self.__stopped.set()
         with Client(self.__listener.address, authkey=self.__listener._authkey) as c:
+            self.__stopped.set()
             c.send(None)
 
         if self.__scanner is not None:

tests/api/test_scan.py

@@ -6,6 +6,7 @@
 # Distributed under terms of the GNU AGPLv3 license.
 
 from pony.orm import db_session
+from time import sleep
 from threading import Thread
 
 from supysonic.daemon.server import Daemon
@@ -37,6 +38,7 @@ class ScanWithDaemonTestCase(ApiTestBase):
         self._daemon = Daemon(self.config)
         self._thread = Thread(target=self._daemon.run)
         self._thread.start()
+        sleep(0.2)  # Wait a bit for the daemon thread to initialize
 
     def tearDown(self):
         self._daemon.terminate()