diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-05-04 12:43:53 -0600 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-05-08 09:31:16 -0600 |
commit | d1c4675e5c35257b84cd69969c6e67575faf19db (patch) | |
tree | 63ff3b41ff445b8c192ec33c0aefb913a112b613 /snaps/provisioning/tests | |
parent | 40c96233ca4c27de1b3d8b53187c302ddd6208a2 (diff) |
Modified code to support both Python 2.7 and 3.x
* Tested on Python 2.7.10 and 3.4.4
* Updated installation documentation
JIRA: SNAPS-30
Change-Id: I94a37d218be8ea47bbbcfb560197737430fcb3ba
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/provisioning/tests')
-rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 41bc199..1f03e09 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -111,9 +111,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): self.inst_creator = create_instance.OpenStackVmInstance( self.os_creds, instance_settings, self.image_creator.image_settings, keypair_settings=self.keypair_creator.keypair_settings) - except Exception as e: + except: self.tearDown() - raise Exception(e.message) + raise def tearDown(self): """ @@ -173,7 +173,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): retval = ansible_utils.apply_playbook('provisioning/tests/playbooks/simple_playbook.yml', [ip], user, priv_key, proxy_setting=self.os_creds.proxy_settings) - self.assertEquals(0, retval) + self.assertEqual(0, retval) ssh = ansible_utils.ssh_client(ip, user, priv_key, self.os_creds.proxy_settings) self.assertIsNotNone(ssh) @@ -184,7 +184,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): with open(self.test_file_local_path) as f: file_contents = f.readline() - self.assertEquals('Hello World!', file_contents) + self.assertEqual('Hello World!', file_contents) def test_apply_template_playbook(self): """ @@ -215,4 +215,4 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): with open(self.test_file_local_path) as f: file_contents = f.readline() - self.assertEquals('Hello Foo!', file_contents) + self.assertEqual('Hello Foo!', file_contents) |