openstack
/
heat
Code Issues Proposed changes

py34: contrib resources 

partial blueprint heat-python34-support

Change-Id: I39b1cf5007a9dae599954054dd9a3ec0472900b6
This commit is contained in:
Sirushti Murugesan 2015-09-22 14:14:31 +05:30
parent a81a99c52b
commit 298055dc48
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/heat_docker/heat_docker/tests/fake_docker_client.py
View File

@ -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:

4
contrib/heat_docker/heat_docker/tests/test_docker_container.py
View File

@ -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')

3
contrib/rackspace/rackspace/tests/test_rackspace_dns.py
View File

@ -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):

2
py3-testlist
View File

@ -1,3 +1,5 @@
rackspace.tests
heat_docker.tests
heat.tests.api.aws.test_api_aws
heat.tests.api.middleware.test_ssl_middleware
heat.tests.api.middleware.test_version_negotiation_middleware