summaryrefslogtreecommitdiff
path: root/heat_cfntools/tests
diff options
context:
space:
mode:
authorSascha Peilicke <saschpe@gmx.de>2014-01-16 09:07:47 +0100
committerSascha Peilicke <saschpe@gmx.de>2014-01-17 08:59:45 +0100
commit8e7c392920acf80456e4e0c27cf6a3bb65ae9b84 (patch)
tree6f037d833a31fa6cf2f9c76955a9fafe5fb91fe2 /heat_cfntools/tests
parent1d0bf6b18f3f41c4406f4e7aa6cbed75f2a430fb (diff)
downloadheat-cfntools-8e7c392920acf80456e4e0c27cf6a3bb65ae9b84.tar.gz
Sync with global requirements
And fix pep8 issues discovered by hacking update. Remove dependencies on pep8, pyflakes and flake8. They should be determined by the hacking dependency implicitely. Change-Id: I3fefdabcfdc09c28756f5ab0f5a99d12de2d8a3a
Diffstat (limited to 'heat_cfntools/tests')
-rw-r--r--heat_cfntools/tests/test_cfn_helper.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/heat_cfntools/tests/test_cfn_helper.py b/heat_cfntools/tests/test_cfn_helper.py
index e42f774..9073d01 100644
--- a/heat_cfntools/tests/test_cfn_helper.py
+++ b/heat_cfntools/tests/test_cfn_helper.py
@@ -497,7 +497,7 @@ class TestCfnHelper(testtools.TestCase):
metadata_info.write(content)
metadata_info.flush()
port = cfn_helper.metadata_server_port(metadata_info.name)
- self.assertEquals(value, port)
+ self.assertEqual(value, port)
def test_metadata_server_port(self):
self._check_metadata_content("http://172.20.42.42:8000\n", 8000)
@@ -521,8 +521,8 @@ class TestCfnHelper(testtools.TestCase):
def test_metadata_server_nofile(self):
random_filename = self.getUniqueString()
- self.assertEquals(None,
- cfn_helper.metadata_server_port(random_filename))
+ self.assertEqual(None,
+ cfn_helper.metadata_server_port(random_filename))
def test_to_boolean(self):
self.assertTrue(cfn_helper.to_boolean(True))