diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-04 20:31:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-04 20:31:15 +0000 |
| commit | 25a77f7c7c00fc8255c330f395ace24a4e75db8b (patch) | |
| tree | 6cd52643d66b003ff324c19d76363cdeaebbf81a /openstackclient/tests/unit/network | |
| parent | abb2498e714cf1915e5ec7a8a344a0a71962bc50 (diff) | |
| parent | 0e42ea3ae325cf5b168bb966e62cd6b8e9ee0159 (diff) | |
| download | python-openstackclient-25a77f7c7c00fc8255c330f395ace24a4e75db8b.tar.gz | |
Merge "Structure FindFloatingIP() to work without ip_cache"
Diffstat (limited to 'openstackclient/tests/unit/network')
| -rw-r--r-- | openstackclient/tests/unit/network/v2/test_floating_ip.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip.py b/openstackclient/tests/unit/network/v2/test_floating_ip.py index e395300d..0b3fd888 100644 --- a/openstackclient/tests/unit/network/v2/test_floating_ip.py +++ b/openstackclient/tests/unit/network/v2/test_floating_ip.py @@ -218,8 +218,8 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): ) def test_floating_ip_delete(self, find_floating_ip_mock): find_floating_ip_mock.side_effect = [ - (self.floating_ips[0], []), - (self.floating_ips[1], []), + self.floating_ips[0], + self.floating_ips[1], ] arglist = [ self.floating_ips[0].id, @@ -233,7 +233,6 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): find_floating_ip_mock.assert_called_once_with( mock.ANY, - [], self.floating_ips[0].id, ignore_missing=False, ) @@ -246,8 +245,8 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): ) def test_floating_ip_delete_multi(self, find_floating_ip_mock): find_floating_ip_mock.side_effect = [ - (self.floating_ips[0], []), - (self.floating_ips[1], []), + self.floating_ips[0], + self.floating_ips[1], ] arglist = [] verifylist = [] @@ -264,13 +263,11 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): calls = [ call( mock.ANY, - [], self.floating_ips[0].id, ignore_missing=False, ), call( mock.ANY, - [], self.floating_ips[1].id, ignore_missing=False, ), @@ -289,7 +286,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): ) def test_floating_ip_delete_multi_exception(self, find_floating_ip_mock): find_floating_ip_mock.side_effect = [ - (self.floating_ips[0], []), + self.floating_ips[0], exceptions.CommandError, ] arglist = [ @@ -310,13 +307,11 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork): find_floating_ip_mock.assert_any_call( mock.ANY, - [], self.floating_ips[0].id, ignore_missing=False, ) find_floating_ip_mock.assert_any_call( mock.ANY, - [], 'unexist_floating_ip', ignore_missing=False, ) @@ -584,7 +579,7 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork): "floating_ip._find_floating_ip" ) def test_floating_ip_show(self, find_floating_ip_mock): - find_floating_ip_mock.return_value = (self.floating_ip, []) + find_floating_ip_mock.return_value = self.floating_ip arglist = [ self.floating_ip.id, ] @@ -597,7 +592,6 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork): find_floating_ip_mock.assert_called_once_with( mock.ANY, - [], self.floating_ip.id, ignore_missing=False, ) |