فهرست منبع

Fixing failing test

The test `ControllerTests.test_real_controller_initialization()` no
longer fails. This was fixed by making sure
`ClientOptions.plugin_factories` was initialized even though no
configuration file has been read.

All tests now (finally!) pass on my workstation.
Jens Rantil 13 سال پیش
والد
کامیت
e698a051d5
1فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 6 6
      supervisor/options.py

+ 6 - 6
supervisor/options.py

@@ -1428,6 +1428,11 @@ class ClientOptions(Options):
         self.configroot.supervisorctl.password = None
         self.configroot.supervisorctl.history_file = None
 
+        from supervisor.supervisorctl import DefaultControllerPlugin
+        default_factory = ('default', DefaultControllerPlugin, {})
+        # we always add the default factory. If you want to a supervisorctl
+        # without the default plugin, please write your own supervisorctl.
+        self.plugin_factories = [default_factory]
 
         self.add("interactive", "supervisorctl.interactive", "i",
                  "interactive", flag=1, default=0)
@@ -1477,16 +1482,11 @@ class ClientOptions(Options):
             section.history_file = None
             self.history_file = None
 
-        from supervisor.supervisorctl import DefaultControllerPlugin
-        self.plugin_factories = self.get_plugins(
+        self.plugin_factories += self.get_plugins(
             config,
             'supervisor.ctl_factory',
             'ctlplugin:'
             )
-        default_factory = ('default', DefaultControllerPlugin, {})
-        # if you want to a supervisorctl without the default plugin,
-        # please write your own supervisorctl.
-        self.plugin_factories.insert(0, default_factory)
 
         return section