Merge "Modify use of assertTrue(A in B)"

This commit is contained in:
Jenkins 2016-09-05 11:28:43 +00:00 committed by Gerrit Code Review
commit 41cd03f265
2 changed files with 2 additions and 2 deletions

View File

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

View File

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