Merge lp:~hazmat/pyjuju/config-set-sans-status into lp:pyjuju

[Kapil Thangavelu]

Simplify config set tests to reduce runtime significantly.

The config set tests where using the status test infrastructure which
builds a quite complex setup. Clint noticed that one of the automated
tests runs against trunk would timeout on the config set test. This branch
simplifies the config set tests to just build what's needed (a deployed
service) and cuts runtime for the the four tests from 12.5s to 2s on
this developer's laptop.

[lp:~hazmat/pyjuju/config-set-sans-status]

393. By Kapil Thangavelu on 2011-10-06

remove commented out bits, oops

[Jim Baker (jimbaker)]

+1, looks like a nice improvement to the current testing. In the past, I found this import from test_status to be surprising. I'm also getting an approx 5x improvement on my desktop, from 5s to 1s.

review: Approve

[Benjamin Saller (bcsaller)]

+1 if just for the better blog-title string ;)

review: Approve

=== modified file 'juju/control/tests/test_config_set.py'
--- juju/control/tests/test_config_set.py	2011-09-15 18:50:23 +0000
+++ juju/control/tests/test_config_set.py	2011-10-06 17:21:30 +0000
@@ -1,41 +1,44 @@
+from yaml import dump
+
 from twisted.internet.defer import inlineCallbacks
 
 from juju.control import main
-from juju.control.config_set import config_set
-from juju.control.tests.test_status import StatusTestBase
-
-
-class ControlJujuSetTest(StatusTestBase):
+from .common import MachineControlToolTest
+
+
+class ControlJujuSetTest(MachineControlToolTest):
 
     @inlineCallbacks
     def setUp(self):
         yield super(ControlJujuSetTest, self).setUp()
+        config = {
+            "environments": {"firstenv": {"type": "dummy"}}}
+        self.write_config(dump(config))
+        self.config.load()
+        self.service_state = yield self.add_service_from_charm("wordpress")
+        self.service_unit = yield self.service_state.add_unit_state()
         self.stderr = self.capture_stream("stderr")
 
     @inlineCallbacks
     def test_set_and_get(self):
-        system = yield self.build_topology()
-
-        self.mock_environment()
+        finished = self.setup_cli_reactor()
+        self.setup_exit(0)
         self.mocker.replay()
 
-        yield config_set(self.environment,
-                         "wordpress",
-                         ["blog-title=That\'ll do, pig."])
+        main(["set",
+              "wordpress",
+              "blog-title=Hello Tribune?"])
+        yield finished
 
         # Verify the state is accessible
-        wordpress = system["services"]["wordpress"]
-        state = yield wordpress.get_config()
-        self.assertEqual(state, {"blog-title": "That\'ll do, pig."})
+        state = yield self.service_state.get_config()
+        self.assertEqual(state, {"blog-title": "Hello Tribune?"})
 
     @inlineCallbacks
     def test_set_invalid_option(self):
-        yield self.build_topology()
-        self.mock_environment()
         finished = self.setup_cli_reactor()
         self.setup_exit(0)
         self.mocker.replay()
-
         main(["set",
               "wordpress",
               "blog-roll=What's a blog-roll?"])
@@ -47,8 +50,6 @@
 
     @inlineCallbacks
     def test_set_invalid_service(self):
-        yield self.build_topology()
-        self.mock_environment()
         finished = self.setup_cli_reactor()
         self.setup_exit(0)
         self.mocker.replay()
@@ -63,8 +64,6 @@
 
     @inlineCallbacks
     def test_set_valid_option(self):
-        system = yield self.build_topology()
-        self.mock_environment()
         finished = self.setup_cli_reactor()
         self.setup_exit(0)
         self.mocker.replay()
@@ -75,6 +74,5 @@
         yield finished
 
         # Verify the state is accessible
-        wordpress = system["services"]["wordpress"]
-        state = yield wordpress.get_config()
+        state = yield self.service_state.get_config()
         self.assertEqual(state, {"blog-title": "My title"})