diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-05 11:28:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-05 11:28:43 +0000 |
| commit | 41cd03f265b980a7d08bcae57b3c0c73e1fff6d4 (patch) | |
| tree | 179091f2b67a438c7417f93112a7fac22a275371 | |
| parent | 80eecf92c9e13f92e3311e22774f4b35981dfeaf (diff) | |
| parent | 7e869ca818a8189ef6fe06c6c82cab284a624597 (diff) | |
| download | python-heatclient-41cd03f265b980a7d08bcae57b3c0c73e1fff6d4.tar.gz | |
Merge "Modify use of assertTrue(A in B)"
| -rw-r--r-- | heatclient/tests/unit/osc/v1/test_template.py | 2 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_template_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heatclient/tests/unit/osc/v1/test_template.py b/heatclient/tests/unit/osc/v1/test_template.py index c69637d..895f628 100644 --- a/heatclient/tests/unit/osc/v1/test_template.py +++ b/heatclient/tests/unit/osc/v1/test_template.py @@ -117,7 +117,7 @@ class TestTemplateValidate(TestTemplate): self.assertEqual(1, self.stack_client.validate.call_count) args = self.stack_client.validate.call_args[1] self.assertEqual(args.get('environment'), {'parameters': {}}) - self.assertTrue(self.env_path in args.get('environment_files')[0]) + self.assertIn(self.env_path, args.get('environment_files')[0]) self.assertEqual([], columns) self.assertEqual([], data) diff --git a/heatclient/tests/unit/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py index 6440af2..d1734b3 100644 --- a/heatclient/tests/unit/test_template_utils.py +++ b/heatclient/tests/unit/test_template_utils.py @@ -411,7 +411,7 @@ class ShellEnvironmentTest(testtools.TestCase): files['file:///home/b/a.yaml']) self.assertEqual(['file:///home/my/dir/env1.yaml'], env_file_list) - self.assertTrue('file:///home/my/dir/env1.yaml' in files) + self.assertIn('file:///home/my/dir/env1.yaml', files) self.assertEqual(expected_env, json.loads(files['file:///home/my/dir/env1.yaml'])) |