Merge lp:~clint-fewbar/pyjuju/fix-failing-local-tests into lp:pyjuju

[Clint Byrum]

Fixing local provider tests to run safely in clean chroots.

[Benjamin Saller (bcsaller)]

+1, Thanks

review: Approve

=== modified file 'juju/providers/local/tests/test_provider.py'
--- juju/providers/local/tests/test_provider.py	2011-09-30 03:20:11 +0000
+++ juju/providers/local/tests/test_provider.py	2011-09-30 17:56:11 +0000
@@ -27,7 +27,8 @@
     def setUp(self):
         self.provider = MachineProvider(
             "local-test", {
-                "admin-secret": "admin:abc", "data-dir": self.makeDir()})
+                "admin-secret": "admin:abc", "data-dir": self.makeDir(),
+                "authorized-keys": "fooabc123"})
         self.output = self.capture_logging(
             "juju.local-dev", level=logging.DEBUG)
         zookeeper.set_debug_level(0)