← Back to branch summary

~dpb/pyjuju/dont-proxy-https

« back to all changes in this revision

Viewing changes to juju/providers/ec2/tests/test_provider.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-04-13 18:01:18 UTC
  • Revision ID: kapil.thangavelu@canonical.com-20120413180118-15h2twzt0i0z145l
[trivial] fix some recent tests that fail to pass without AWS_ env vars set [r=clint-fewbar]

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/ec2/tests/test_provider.py
24
24
        with the right arguments.  This explores the mocking which is already
25
25
        happening within EC2TestMixin.
26
26
        """
27
 
        expected_kwargs = {"access_key": "",
28
 
                           "secret_key": "",
 
27
        expected_kwargs = {"access_key": "foo",
 
28
                           "secret_key": "bar",
29
29
                           "ec2_uri": "https://ec2.us-east-1.amazonaws.com",
30
30
                           "s3_uri": ""}
31
31
 
32
 
        MachineProvider(self.env_name, {})
 
32
        MachineProvider(self.env_name, {"access-key": "foo", "secret-key": "bar"})
33
33
        self.assertEquals(self.service_factory_kwargs, expected_kwargs)
34
34
 
35
35
    def test_service_factory_construction(self):
177
177
 
178
178
    def test_get_legacy_config_keys(self):
179
179
        provider = MachineProvider(self.env_name, {
 
180
            "access-key": "foo", "secret-key": "bar",
180
181
            # Note: these keys *will* at some stage be considered legacy keys;
181
182
            # they're included here to make sure the tests are updated when we
182
183
            # make that change.