← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/maas/maas-pserv-auth-build-fix into lp:maas

 

Gavin Panella has proposed merging lp:~allenap/maas/maas-pserv-auth-build-fix into lp:maas with lp:~allenap/maas/pyasn1-and-twisted-needed-by-maas as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/maas-pserv-auth-build-fix/+merge/101573
-- 
https://code.launchpad.net/~allenap/maas/maas-pserv-auth-build-fix/+merge/101573
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/maas-pserv-auth-build-fix into lp:maas.
=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py	2012-04-10 21:20:32 +0000
+++ src/provisioningserver/tests/test_plugin.py	2012-04-11 14:48:30 +0000
@@ -29,6 +29,7 @@
     ProvisioningServiceMaker,
     SingleUsernamePasswordChecker,
     )
+from provisioningserver.testing.fakecobbler import make_fake_cobbler_session
 from testtools import TestCase
 from testtools.deferredruntest import (
     assert_fails_with,
@@ -223,6 +224,9 @@
         options = Options()
         options["config-file"] = config_file
         service_maker = ProvisioningServiceMaker("Morecombe", "Wise")
+        # Terminate the service in a fake Cobbler session.
+        service_maker._makeCobblerSession = (
+            lambda config: make_fake_cobbler_session())
         service = service_maker.makeService(options)
         port, site = service.getServiceNamed("site").args
         api = site.resource.getStaticEntity("api")