juju/control should be aware of subordinates

juju/control/tests/test_control.py

 import logging
 import time
 import os
 
 from StringIO import StringIO
 from argparse import Namespace
-from yaml import dump
 
 from twisted.internet.defer import inlineCallbacks
 
 from juju.environment.errors import EnvironmentsConfigError
 from juju.control import setup_logging, main, setup_parser
 from juju.control.options import ensure_abs_path
 from juju.control.command import Commander
+from juju.state.tests.common import StateTestBase
 
 from juju.lib.testing import TestCase
 
 from .common import ControlToolTest
 
 
 class ControlInitiailizationTest(ControlToolTest):
 
     # The EnvironmentTestBase will replace our $HOME, so that tests will
     # write properly to a temporary directory.
     def test_write_sample_config(self):
         """
         When juju-control is called without a valid environment
         configuration, it should write one down and raise an error to
         let the user know it should be edited.
         """
         try:
-            main([])
+            main(["bootstrap"])
         except EnvironmentsConfigError, error:
             self.assertTrue(error.sample_written)
         else:
             self.fail("EnvironmentsConfigError not raised")
 
 
-class ControlOutputTest(ControlToolTest):
+class ControlOutputTest(ControlToolTest, StateTestBase):
 
+    @inlineCallbacks
     def setUp(self):
-        super(ControlOutputTest, self).setUp()
-        config = {
-            "environments": {
-                "firstenv": {
-                    "type": "dummy", "admin-secret": "homer"},
-                "secondenv": {
-                    "type": "dummy", "admin-secret": "marge"}}}
-        self.write_config(dump(config))
+        yield super(ControlOutputTest, self).setUp()
+        yield self.push_default_config()
 
     def test_sans_args_produces_help(self):
         """
         When juju-control is called without arguments, it
         produces a standard help message.
         """
         stderr = self.capture_stream("stderr")
         self.mocker.replay()
         try:
             main([])
@@ skipping 243 matching lines @@
         self.setup_exit(1)
 
         com = Commander(self.deferred_callback_with_exception)
         ns = self.get_sample_namespace()
         ns.verbose = True
 
         self.mocker.replay()
         com(ns)
 
         self.assertIn("traceback", err.getvalue())