diff options
| author | Sirushti Murugesan <sirushti.murugesan@hp.com> | 2015-09-22 14:14:31 +0530 |
|---|---|---|
| committer | Sirushti Murugesan <sirushti.murugesan@hp.com> | 2015-09-22 22:50:23 +0530 |
| commit | 298055dc48cb746730a7e03d7f5255f6d4f4daa3 (patch) | |
| tree | ebfa93b56d8319f9752c7904778357069a0cd8b4 /contrib | |
| parent | a81a99c52b0aca4f30890d0ef5af14bc27eae524 (diff) | |
| download | heat-298055dc48cb746730a7e03d7f5255f6d4f4daa3.tar.gz | |
py34: contrib resources
partial blueprint heat-python34-support
Change-Id: I39b1cf5007a9dae599954054dd9a3ec0472900b6
Diffstat (limited to 'contrib')
3 files changed, 5 insertions, 4 deletions
diff --git a/contrib/heat_docker/heat_docker/tests/fake_docker_client.py b/contrib/heat_docker/heat_docker/tests/fake_docker_client.py index 061cc4c32..9c48e1e37 100644 --- a/contrib/heat_docker/heat_docker/tests/fake_docker_client.py +++ b/contrib/heat_docker/heat_docker/tests/fake_docker_client.py @@ -33,7 +33,7 @@ class FakeDockerClient(object): self.version_info = {} def _generate_string(self, n=32): - return ''.join(random.choice(string.lowercase) for i in range(n)) + return ''.join(random.choice(string.ascii_lowercase) for i in range(n)) def _check_exists(self, container_id): if container_id not in self._containers: diff --git a/contrib/heat_docker/heat_docker/tests/test_docker_container.py b/contrib/heat_docker/heat_docker/tests/test_docker_container.py index 3f2e1cf47..5b3bd9ee7 100644 --- a/contrib/heat_docker/heat_docker/tests/test_docker_container.py +++ b/contrib/heat_docker/heat_docker/tests/test_docker_container.py @@ -29,8 +29,8 @@ from heat.tests import utils import testtools -from ..resources import docker_container # noqa -import fake_docker_client as fakeclient # noqa +from heat_docker.resources import docker_container +from heat_docker.tests import fake_docker_client as fakeclient docker = importutils.try_import('docker') diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py index 60d895ca5..741812b59 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py @@ -154,7 +154,8 @@ class RackspaceDnsTest(common.HeatTestCase): create_record_args = dict() create_record_args['records'] = record_with_comment create_args = dict( - self.create_domain_only_args.items() + create_record_args.items()) + list(self.create_domain_only_args.items()) + + list(create_record_args.items())) return create_args def test_create_domain_only(self): |