Merge lp:~rvb/maas/fix-broken-build into lp:maas/trunk

[Raphaël Badin]

Fix broken build: update tests to reflect changes made to MAASClient.

Fix broken build: update tests to reflect changes made to MAASClient.

[Raphaël Badin (rvb)]

Self-reviewing this as this is a simple fix to the tests and it will fix the build.

review: Approve

[MAAS Lander (maas-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/129/console reported an error when processing this lp:~rvb/maas/fix-broken-build branch.
Not merging it.

[Julian Edwards (julian-edwards)]

On Friday 05 October 2012 17:33:28 you wrote:
> Raphaël Badin has proposed merging lp:~rvb/maas/fix-broken-build into
> lp:maas.
>
> Commit message:
> Fix broken build: update tests to reflect changes made to MAASClient.
>
> Requested reviews:
> Raphaël Badin (rvb)
>
> For more details, see:
> https://code.launchpad.net/~rvb/maas/fix-broken-build/+merge/128297
>
> Fix broken build: update tests to reflect changes made to MAASClient.
>
> Someone left a good old Friday evening upper decker ;).

How the heck did this get past Jenkins?!

[Gavin Panella (allenap)]

On 8 October 2012 01:13, Julian Edwards <...> wrote:
...
>> Someone left a good old Friday evening upper decker ;).
>
> How the heck did this get past Jenkins?!

Indeed, I thought that the new gated trunk would prevent this. Sorry
to anyone who got the beef stew on Friday.

[Raphaël Badin (rvb)]

> How the heck did this get past Jenkins?!

Not sure how this could happen… my only guess is that this is the result of a semantic merge conflict.

=== modified file 'src/provisioningserver/tests/test_start_cluster_controller.py'
--- src/provisioningserver/tests/test_start_cluster_controller.py	2012-10-04 15:12:57 +0000
+++ src/provisioningserver/tests/test_start_cluster_controller.py	2012-10-05 17:36:39 +0000
@@ -33,6 +33,7 @@
     )
 from provisioningserver import start_cluster_controller
 from provisioningserver.testing.testcase import PservTestCase
+from testtools.matchers import StartsWith
 
 
 class Sleeping(Exception):
@@ -154,7 +155,7 @@
         self.prepare_success_response()
         start_cluster_controller.run(make_args(server_url=url))
         (args, kwargs) = MAASDispatcher.dispatch_query.call_args
-        self.assertEqual(url + 'api/1.0/nodegroups/', args[0])
+        self.assertThat(args[0], StartsWith(url + 'api/1.0/nodegroups/'))
 
     def test_fails_if_declined(self):
         self.patch(start_cluster_controller, 'start_up')
@@ -223,12 +224,12 @@
             factory.make_name('user'), factory.make_name('group'))
 
         (args, kwargs) = MAASDispatcher.dispatch_query.call_args
-        self.assertEqual(url + 'api/1.0/nodegroups/', args[0])
+        self.assertEqual(
+            url + 'api/1.0/nodegroups/?op=refresh_workers', args[0])
         self.assertEqual('POST', kwargs['method'])
 
         headers, body = kwargs["headers"], kwargs["data"]
         post, files = self.parse_headers_and_body(headers, body)
-        self.assertEqual("refresh_workers", post["op"])
 
     def test_start_up_ignores_failure_on_refresh_secrets(self):
         start_cluster_controller.sleep.side_effect = None