diff options
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 24 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 5 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_keypairs_tests.py | 34 |
3 files changed, 45 insertions, 18 deletions
diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index e7c34b9..4a2ce3d 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -56,17 +56,17 @@ class ProxySettingsUnitTests(unittest.TestCase): def test_minimum(self): proxy_settings = ProxySettings(host='foo', port=1234) self.assertEqual('foo', proxy_settings.host) - self.assertEqual(1234, proxy_settings.port) + self.assertEqual('1234', proxy_settings.port) self.assertEqual('foo', proxy_settings.https_host) - self.assertEqual(1234, proxy_settings.https_port) + self.assertEqual('1234', proxy_settings.https_port) self.assertIsNone(proxy_settings.ssh_proxy_cmd) def test_minimum_kwargs(self): proxy_settings = ProxySettings(**{'host': 'foo', 'port': 1234}) self.assertEqual('foo', proxy_settings.host) - self.assertEqual(1234, proxy_settings.port) + self.assertEqual('1234', proxy_settings.port) self.assertEqual('foo', proxy_settings.https_host) - self.assertEqual(1234, proxy_settings.https_port) + self.assertEqual('1234', proxy_settings.https_port) self.assertIsNone(proxy_settings.ssh_proxy_cmd) def test_all(self): @@ -74,9 +74,9 @@ class ProxySettingsUnitTests(unittest.TestCase): host='foo', port=1234, https_host='bar', https_port=2345, ssh_proxy_cmd='proxy command') self.assertEqual('foo', proxy_settings.host) - self.assertEqual(1234, proxy_settings.port) + self.assertEqual('1234', proxy_settings.port) self.assertEqual('bar', proxy_settings.https_host) - self.assertEqual(2345, proxy_settings.https_port) + self.assertEqual('2345', proxy_settings.https_port) self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd) def test_all_kwargs(self): @@ -84,9 +84,9 @@ class ProxySettingsUnitTests(unittest.TestCase): **{'host': 'foo', 'port': 1234, 'https_host': 'bar', 'https_port': 2345, 'ssh_proxy_cmd': 'proxy command'}) self.assertEqual('foo', proxy_settings.host) - self.assertEqual(1234, proxy_settings.port) + self.assertEqual('1234', proxy_settings.port) self.assertEqual('bar', proxy_settings.https_host) - self.assertEqual(2345, proxy_settings.https_port) + self.assertEqual('2345', proxy_settings.https_port) self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd) @@ -245,7 +245,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) - self.assertEqual(1234, os_creds.proxy_settings.port) + self.assertEqual('1234', os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) self.assertIsNone(os_creds.region_name) @@ -269,7 +269,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) - self.assertEqual(1234, os_creds.proxy_settings.port) + self.assertEqual('1234', os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) self.assertEqual('test_region', os_creds.region_name) @@ -290,7 +290,7 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) - self.assertEqual(1234, os_creds.proxy_settings.port) + self.assertEqual('1234', os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) def test_proxy_settings_dict_kwargs(self): @@ -312,6 +312,6 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) - self.assertEqual(1234, os_creds.proxy_settings.port) + self.assertEqual('1234', os_creds.proxy_settings.port) self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd) self.assertEqual('test_region', os_creds.region_name) diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 75b0ed3..1922146 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -1717,7 +1717,10 @@ def validate_ssh_client(instance_creator): if ssh_active: ssh_client = instance_creator.ssh_client() if ssh_client: - out = ssh_client.exec_command('pwd')[1] + try: + out = ssh_client.exec_command('pwd')[1] + finally: + ssh_client.close() else: return False diff --git a/snaps/openstack/tests/create_keypairs_tests.py b/snaps/openstack/tests/create_keypairs_tests.py index 0b35095..7b75d05 100644 --- a/snaps/openstack/tests/create_keypairs_tests.py +++ b/snaps/openstack/tests/create_keypairs_tests.py @@ -285,9 +285,15 @@ class CreateKeypairsTests(OSIntegrationTestCase): self.keypair_creator.get_keypair()) self.assertEqual(self.keypair_creator.get_keypair(), keypair) - file_key = open(os.path.expanduser(self.pub_file_path)).read() - self.assertEqual(self.keypair_creator.get_keypair().public_key, - file_key) + pub_file = None + try: + pub_file = open(os.path.expanduser(self.pub_file_path)) + file_key = pub_file.read() + self.assertEqual(self.keypair_creator.get_keypair().public_key, + file_key) + finally: + if pub_file: + pub_file.close() def test_create_keypair_save_both(self): """ @@ -305,7 +311,16 @@ class CreateKeypairsTests(OSIntegrationTestCase): self.keypair_creator.get_keypair()) self.assertEqual(self.keypair_creator.get_keypair(), keypair) - file_key = open(os.path.expanduser(self.pub_file_path)).read() + pub_file = None + try: + pub_file = open(os.path.expanduser(self.pub_file_path)) + file_key = pub_file.read() + self.assertEqual(self.keypair_creator.get_keypair().public_key, + file_key) + finally: + if pub_file: + pub_file.close() + self.assertEqual(self.keypair_creator.get_keypair().public_key, file_key) @@ -328,7 +343,16 @@ class CreateKeypairsTests(OSIntegrationTestCase): self.keypair_creator.get_keypair()) self.assertEqual(self.keypair_creator.get_keypair(), keypair) - file_key = open(os.path.expanduser(self.pub_file_path)).read() + pub_file = None + try: + pub_file = open(os.path.expanduser(self.pub_file_path)) + file_key = pub_file.read() + self.assertEqual(self.keypair_creator.get_keypair().public_key, + file_key) + finally: + if pub_file: + pub_file.close() + self.assertEqual(self.keypair_creator.get_keypair().public_key, file_key) |