fix setting config on common base classes

replace Mixin with Launcher, since it's a public config API

and it's not really a Mixin, it must be Configurable for its traits to be configurable...

Author: minrk

ipyparallel/cluster/launcher.py

@@ -29,15 +29,7 @@
 
 from subprocess import Popen, PIPE, STDOUT
 
-try:
-    from subprocess import check_output
-except ImportError:
-    # pre-2.7, define check_output with Popen
-    def check_output(*args, **kwargs):
-        kwargs.update(dict(stdout=PIPE))
-        p = Popen(*args, **kwargs)
-        out, err = p.communicate()
-        return out
+from subprocess import check_output
 
 
 from traitlets import import_item
@@ -51,7 +43,6 @@ def check_output(*args, **kwargs):
     Unicode,
     Dict,
     Instance,
-    HasTraits,
     CRegExp,
     observe,
 )
@@ -220,7 +211,7 @@ def signal(self, sig):
         raise NotImplementedError('signal must be implemented in a subclass')
 
 
-class ClusterAppMixin(HasTraits):
+class ClusterAppMixin(LoggingConfigurable):
     """MixIn for cluster args as traits"""
 
     profile_dir = Unicode('')
@@ -231,7 +222,7 @@ def cluster_args(self):
         return ['--profile-dir', self.profile_dir, '--cluster-id', self.cluster_id]
 
 
-class ControllerMixin(ClusterAppMixin):
+class ControllerLauncher(ClusterAppMixin):
     controller_cmd = List(
         ipcontroller_cmd_argv,
         config=True,
@@ -245,7 +236,7 @@ class ControllerMixin(ClusterAppMixin):
     )
 
 
-class EngineMixin(ClusterAppMixin):
+class EngineLauncher(ClusterAppMixin):
     engine_cmd = List(
         ipengine_cmd_argv, config=True, help="""command to launch the Engine."""
     )
@@ -370,7 +361,7 @@ def poll(self):
         return status
 
 
-class LocalControllerLauncher(LocalProcessLauncher, ControllerMixin):
+class LocalControllerLauncher(LocalProcessLauncher, ControllerLauncher):
     """Launch a controller as a regular external process."""
 
     def find_args(self):
@@ -381,7 +372,7 @@ def start(self):
         return super(LocalControllerLauncher, self).start()
 
 
-class LocalEngineLauncher(LocalProcessLauncher, EngineMixin):
+class LocalEngineLauncher(LocalProcessLauncher, EngineLauncher):
     """Launch a single engine as a regular external process."""
 
     def find_args(self):
@@ -521,7 +512,7 @@ def start(self, n):
         return super(MPILauncher, self).start()
 
 
-class MPIControllerLauncher(MPILauncher, ControllerMixin):
+class MPIControllerLauncher(MPILauncher, ControllerLauncher):
     """Launch a controller using mpiexec."""
 
     # alias back to *non-configurable* program[_args] for use in find_args()
@@ -540,7 +531,7 @@ def start(self):
         return super(MPIControllerLauncher, self).start(1)
 
 
-class MPIEngineSetLauncher(MPILauncher, EngineMixin):
+class MPIEngineSetLauncher(MPILauncher, EngineLauncher):
     """Launch engines using mpiexec"""
 
     # alias back to *non-configurable* program[_args] for use in find_args()
@@ -762,7 +753,7 @@ def cluster_args(self):
         return ['--profile-dir', self.remote_profile_dir]
 
 
-class SSHControllerLauncher(SSHClusterLauncher, ControllerMixin):
+class SSHControllerLauncher(SSHClusterLauncher, ControllerLauncher):
 
     # alias back to *non-configurable* program[_args] for use in find_args()
     # this way all Controller/EngineSetLaunchers have the same form, rather
@@ -789,7 +780,7 @@ def _to_fetch_default(self):
         ]
 
 
-class SSHEngineLauncher(SSHClusterLauncher, EngineMixin):
+class SSHEngineLauncher(SSHClusterLauncher, EngineLauncher):
 
     # alias back to *non-configurable* program[_args] for use in find_args()
     # this way all Controller/EngineSetLaunchers have the same form, rather

ipyparallel/tests/test_cluster.py

@@ -39,11 +39,12 @@ def ClusterConstructor(**kwargs):
             pytest.skip("requires mpiexec")
 
         cfg = kwargs.setdefault("config", Config())
-        cfg.EngineMixin.engine_args = ['--log-level=10']
-        cfg.ControllerMixin.controller_args = ['--log-level=10']
+        cfg.EngineLauncher.engine_args = ['--log-level=10']
+        cfg.ControllerLauncher.controller_args = ['--log-level=10']
         kwargs.setdefault("controller_args", ['--ping=250'])
 
         c = cluster.Cluster(**kwargs)
+        assert c.config is cfg
         request.addfinalizer(c.stop_cluster_sync)
         return c
 
@@ -72,6 +73,8 @@ async def test_start_stop_controller(Cluster):
     await cluster.start_controller()
     with pytest.raises(RuntimeError):
         await cluster.start_controller()
+    assert cluster.config is not None
+    assert cluster._controller.config is cluster.config
     assert cluster._controller is not None
     proc = cluster._controller.process
     assert proc.poll() is None
@@ -91,11 +94,17 @@ async def test_start_stop_controller(Cluster):
 async def test_start_stop_engines(Cluster, engine_launcher_class):
     cluster = Cluster(engine_launcher_class=engine_launcher_class)
     await cluster.start_controller()
-    engine_set_id = await cluster.start_engines(n=3)
+
+    n = 3
+    engine_set_id = await cluster.start_engines(n)
     assert engine_set_id in cluster._engine_sets
     engine_set = cluster._engine_sets[engine_set_id]
     launcher_class = find_launcher_class(engine_launcher_class, "EngineSet")
     assert isinstance(engine_set, launcher_class)
+
+    with cluster.connect_client() as rc:
+        rc.wait_for_engines(n, timeout=_timeout)
+
     await cluster.stop_engines(engine_set_id)
     assert cluster._engine_sets == {}
     with pytest.raises(KeyError):