Changeset bb0e69

Timestamp:

05/08/2016 11:00:44 AM (9 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

616523c

Parents:

d5294d

git-author:

bendikro <bro.devel+deluge@gmail.com> (04/28/2016 10:13:28 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (05/08/2016 11:00:44 AM)

Message:

[UI] Add tests for ui_entry

Location:

deluge

Files:

• plugins/WebUi/deluge/plugins/webui/core.py (modified) (1 diff)
• tests/test_ui_entry.py (added)
• tests/test_web_api.py (modified) (1 diff)
• ui/gtkui/gtkui.py (modified) (4 diffs)
• ui/gtkui/ipcinterface.py (modified) (4 diffs)
• ui/web/server.py (modified) (7 diffs)
• ui/web/web.py (modified) (1 diff)

deluge/plugins/WebUi/deluge/plugins/webui/core.py

@@ -67 +67 @@
                 self.server = component.get("DelugeWeb")
             except KeyError:
-                self.server = server.DelugeWeb()
+                self.server = server.DelugeWeb(daemon=False)
 
         self.server.port = self.config["port"]
         self.server.https = self.config["ssl"]
         try:
-            self.server.start(standalone=False)
+            self.server.start()
         except CannotListenError as ex:
             log.warn("Failed to start WebUI server: %s", ex)

deluge/tests/test_web_api.py

@@ -65 +65 @@
         self.config = configmanager.ConfigManager("web.conf", config_defaults)
 
-        self.deluge_web = DelugeWeb()
+        self.deluge_web = DelugeWeb(daemon=False)
 
         host = list(self.deluge_web.web_api.host_list["hosts"][0])

deluge/ui/gtkui/gtkui.py

@@ -29 +29 @@
 except ReactorAlreadyInstalledError as ex:
     # Running unit tests so trial already installed a rector
-    pass
+    from twisted.internet import reactor
 
 import deluge.common
@@ -152 +152 @@
         def run(options):
             try:
-                GtkUI(options)
+                gtkui = GtkUI(options)
+                gtkui.start()
             except Exception as ex:
                 log.exception(ex)
@@ -251 +252 @@
         self.daemon_bps = (0, 0, 0)
         self.rpc_stats = LoopingCall(self.print_rpc_stats)
+        self.closing = False
 
         # Twisted catches signals to terminate, so have it call a pre_shutdown method.
         reactor.addSystemEventTrigger("before", "gtkui_close", self.close)
-
-        reactor.callWhenRunning(self._on_reactor_start)
-        self.closing = False
 
         def gtkui_sigint_handler(num, frame):
@@ -263 +262 @@
 
         signal.signal(signal.SIGINT, gtkui_sigint_handler)
+
+    def start(self):
+        reactor.callWhenRunning(self._on_reactor_start)
 
         # Initialize gdk threading

deluge/ui/gtkui/ipcinterface.py

@@ -75 +75 @@
     def __init__(self, args):
         component.Component.__init__(self, "IPCInterface")
+        self.listener = None
         ipc_dir = get_config_dir("ipc")
         if not os.path.exists(ipc_dir):
@@ -92 +93 @@
                 import random
                 port = random.randrange(20000, 65535)
-                reactor.listenTCP(port, self.factory)
+                self.listener = reactor.listenTCP(port, self.factory)
                 # Store the port number in the socket file
                 open(socket, "w").write(str(port))
@@ -133 +134 @@
                 self.factory = Factory()
                 self.factory.protocol = IPCProtocolServer
-                reactor.listenUNIX(socket, self.factory, wantPID=True)
+                self.listener = reactor.listenUNIX(socket, self.factory, wantPID=True)
             except twisted.internet.error.CannotListenError as ex:
                 log.info("Deluge is already running! Sending arguments to running instance...")
@@ -161 +162 @@
             import win32api
             win32api.CloseHandle(self.mutex)
+        if self.listener:
+            return self.listener.stopListening()
 
 

deluge/ui/web/server.py

@@ -533 +533 @@
 class DelugeWeb(component.Component):
 
-    def __init__(self, options=None):
-        super(DelugeWeb, self).__init__("DelugeWeb")
+    def __init__(self, options=None, daemon=True):
+        """
+        Setup the DelugeWeb server.
+
+        Args:
+            options (argparse.Namespace): The web server options.
+            daemon (bool): If True run web server as a seperate daemon process (starts a twisted
+                reactor). If False shares the process and twisted reactor from WebUI plugin or tests.
+
+        """
+        component.Component.__init__(self, "DelugeWeb", depend=["Web"])
         self.config = configmanager.ConfigManager("web.conf", CONFIG_DEFAULTS)
         self.config.run_converter((0, 1), 2, self._migrate_config_1_to_2)
@@ -568 +577 @@
 
         self.auth = Auth(self.config)
-        self.standalone = True
+        self.daemon = daemon
         # Initalize the plugins
         self.plugins = PluginManager()
@@ -595 +604 @@
             SetConsoleCtrlHandler(win_handler)
 
-    def start(self, standalone=True):
+    def start(self):
         """
         Start the DelugeWeb server
-
-        When running WebUI plugin, the server must not try to start
-        the twisted reactor.
-
-        Args:
-            standalone (bool): Whether the server runs as a standalone process
-                               If standalone, start twisted reactor.
         """
         if self.socket:
@@ -610 +612 @@
             return
 
-        self.standalone = standalone
         log.info("Starting webui server at PID %s", os.getpid())
         if self.https:
@@ -619 +620 @@
         component.get("Web").enable()
 
-        if self.standalone:
+        if self.daemon:
             reactor.run()
 
@@ -642 +643 @@
     def stop(self):
         log.info("Shutting down webserver")
-        component.get("Web").disable()
+        try:
+            component.get("Web").disable()
+        except KeyError:
+            pass
 
         self.plugins.disable_plugins()
@@ -658 +662 @@
     def shutdown(self, *args):
         self.stop()
-        if self.standalone and reactor.running:
+        if self.daemon and reactor.running:
             reactor.stop()
 

deluge/ui/web/web.py

@@ -61 +61 @@
                 self.server.start()
             except CannotListenError as ex:
-                log.error("%s \nCheck that deluge-web or webui plugin are not already running.", ex)
+                log.error("%s \nCheck that deluge-web or webui plugin is not already running.", ex)
             except Exception as ex:
                 log.exception(ex)