Merge lp:~clint-fewbar/pyjuju/fix-tests-with-no-ssh-key into lp:pyjuju

[Clint Byrum]

This allows the tests to run without a pre-existing SSH key in one's home
directory. Its difficult to test the failure because you need a user with
no ssh key, even if you override HOME, because os.path.expanduser() falls
back to using 'getent()' to find the user's home directory if HOME is
not set (hence the preservation of HOME in ensemble.lib.testing.TestCase).

[Gustavo Niemeyer (niemeyer)]

Looks mostly ok, but the test is being rendered non-useful by
this change:

[1]

30 - self.env_name, {"access-key": "secret-12345"})
31 + self.env_name, config)

The original test verified that the config loaded from the environment
is the one expected. Now the serialized data is built having the
expected config at hand already, so the test that verified that it
was actually loaded from the environment is gone.

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

I suppose it would help to read the description of the test before changing it! :)

Pushed a fixed version up and re-opening as Ready for Review.

[Gustavo Niemeyer (niemeyer)]

Thanks!

review: Approve

[Gustavo Niemeyer (niemeyer)]

Please feel free to merge this.

=== modified file 'ensemble/lib/testing.py'
--- ensemble/lib/testing.py	2011-08-03 06:04:37 +0000
+++ ensemble/lib/testing.py	2011-09-12 16:46:04 +0000
@@ -100,6 +100,7 @@
                     "AWS_SECRET_ACCESS_KEY",
                     "EC2_PRIVATE_KEY",
                     "EC2_CERT",
+                    "HOME",
                     "ZOOKEEPER_ADDRESS"]:
             if env not in kw:
                 kw[env] = os.environ.get(env, "")

=== modified file 'ensemble/providers/ec2/tests/test_provider.py'
--- ensemble/providers/ec2/tests/test_provider.py	2011-08-29 02:23:11 +0000
+++ ensemble/providers/ec2/tests/test_provider.py	2011-09-12 16:46:04 +0000
@@ -102,7 +102,8 @@
         the environment, when serializing.
         """
         config = {"access-key": "secret-12345",
-                  "secret-key": "secret-abc"}
+                  "secret-key": "secret-abc",
+                  "authorized-keys": "0123456789abcdef"}
 
         environ = {
             "AWS_SECRET_ACCESS_KEY": "secret-abc",
@@ -110,9 +111,9 @@
 
         self.change_environment(**environ)
         provider = MachineProvider(
-            self.env_name, {"access-key": "secret-12345"})
+            self.env_name, {"access-key": "secret-12345",
+                            "authorized-keys": "0123456789abcdef"})
         serialized = provider.get_serialization_data()
-        serialized.pop("authorized-keys", None)
         self.assertEqual(config, serialized)