Ensure library and tests close all necessary resources.

[snaps.git] / snaps / openstack / tests / conf / os_credentials_tests.py

diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py
index e7c34b9..4a2ce3d 100644 (file)
--- 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)