diff options
| -rw-r--r-- | heat_cfntools/tests/test_cfn_helper.py | 7 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/heat_cfntools/tests/test_cfn_helper.py b/heat_cfntools/tests/test_cfn_helper.py index 06e6caf..d13324a 100644 --- a/heat_cfntools/tests/test_cfn_helper.py +++ b/heat_cfntools/tests/test_cfn_helper.py @@ -823,8 +823,7 @@ class TestCfnHelper(testtools.TestCase): def test_metadata_server_nofile(self): random_filename = self.getUniqueString() - self.assertEqual(None, - cfn_helper.metadata_server_port(random_filename)) + self.assertIsNone(cfn_helper.metadata_server_port(random_filename)) def test_to_boolean(self): self.assertTrue(cfn_helper.to_boolean(True)) @@ -1171,7 +1170,7 @@ class TestMetadataRetrieve(testtools.TestCase): mock_popen.side_effect = write_cache_file md = cfn_helper.Metadata('teststack', None) meta_out = md.get_nova_meta(cache_path=cache_path) - self.assertEqual(None, meta_out) + self.assertIsNone(meta_out) mock_popen.assert_has_calls( popen_root_calls([['curl', '-o', cache_path, url]])) @@ -1190,7 +1189,7 @@ class TestMetadataRetrieve(testtools.TestCase): mock_popen.return_value = FakePOpen('Failed', '', 1) md = cfn_helper.Metadata('teststack', None) meta_out = md.get_nova_meta(cache_path=cache_path) - self.assertEqual(None, meta_out) + self.assertIsNone(meta_out) mock_popen.assert_has_calls( popen_root_calls([['curl', '-o', cache_path, url]])) diff --git a/requirements.txt b/requirements.txt index 531eb32..e595465 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ pbr>=0.6,!=0.7,<1.0 -argparse boto>=2.12.0,!=2.13.0 psutil>=1.1.1,<2.0.0 six>=1.9.0 @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py33,py34,pep8 +envlist = py34,py27,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -7,9 +7,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' -[tox:jenkins] -downloadcache = ~/cache/pip - [testenv:pep8] commands = flake8 flake8 --filename=cfn-* bin |