Merge "tests: Remove use of unnecessary fake argparse Namespace"

Author: Zuul

openstackclient/tests/unit/compute/v2/test_server.py

@@ -513,7 +513,7 @@ def setUp(self):
         self.network_client.update_ip = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = server.AddFloatingIP(self.app, self.namespace)
+        self.cmd = server.AddFloatingIP(self.app, None)
 
     def test_server_add_floating_ip(self):
         _server = compute_fakes.create_one_server()
@@ -7182,7 +7182,7 @@ def setUp(self):
         self.network_client.update_ip = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = server.RemoveFloatingIP(self.app, self.namespace)
+        self.cmd = server.RemoveFloatingIP(self.app, None)
 
     def test_server_remove_floating_ip_default(self):
         _server = compute_fakes.create_one_server()

openstackclient/tests/unit/network/test_common.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import argparse
 from unittest import mock
 
 import openstack
@@ -126,8 +125,6 @@ class TestNetworkAndCompute(utils.TestCommand):
     def setUp(self):
         super().setUp()
 
-        self.namespace = argparse.Namespace()
-
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
 
@@ -143,7 +140,7 @@ def setUp(self):
             return_value='take_action_compute'
         )
 
-        self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
+        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 
     def test_take_action_network(self):
         arglist = ['common', 'network']
@@ -168,19 +165,19 @@ def test_take_action_compute(self):
 class TestNetworkAndComputeCommand(TestNetworkAndCompute):
     def setUp(self):
         super(TestNetworkAndComputeCommand, self).setUp()
-        self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
+        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 
 
 class TestNetworkAndComputeLister(TestNetworkAndCompute):
     def setUp(self):
         super(TestNetworkAndComputeLister, self).setUp()
-        self.cmd = FakeNetworkAndComputeLister(self.app, self.namespace)
+        self.cmd = FakeNetworkAndComputeLister(self.app, None)
 
 
 class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
     def setUp(self):
         super(TestNetworkAndComputeShowOne, self).setUp()
-        self.cmd = FakeNetworkAndComputeShowOne(self.app, self.namespace)
+        self.cmd = FakeNetworkAndComputeShowOne(self.app, None)
 
     def test_take_action_with_http_exception(self):
         with mock.patch.object(self.cmd, 'take_action_network') as m_action:
@@ -207,8 +204,6 @@ class TestNeutronCommandWithExtraArgs(utils.TestCommand):
     def setUp(self):
         super(TestNeutronCommandWithExtraArgs, self).setUp()
 
-        self.namespace = argparse.Namespace()
-
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
 
@@ -217,9 +212,7 @@ def setUp(self):
         self.network_client.test_create_action = mock.Mock()
 
         # Subclasses can override the command object to test.
-        self.cmd = FakeCreateNeutronCommandWithExtraArgs(
-            self.app, self.namespace
-        )
+        self.cmd = FakeCreateNeutronCommandWithExtraArgs(self.app, None)
 
     def test_create_extra_attributes_default_type(self):
         arglist = [

openstackclient/tests/unit/network/v2/fakes.py

@@ -10,7 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import argparse
 import copy
 from random import choice
 from random import randint
@@ -106,10 +105,7 @@ class TestNetworkV2(
     FakeClientMixin,
     utils.TestCommand,
 ):
-    def setUp(self):
-        super().setUp()
-
-        self.namespace = argparse.Namespace()
+    ...
 
 
 def create_one_extension(attrs=None):

openstackclient/tests/unit/network/v2/test_address_group.py

@@ -63,7 +63,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_group.CreateAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.CreateAddressGroup(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -153,7 +153,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_group.DeleteAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.DeleteAddressGroup(self.app, None)
 
     def test_address_group_delete(self):
         arglist = [
@@ -256,7 +256,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_group.ListAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.ListAddressGroup(self.app, None)
 
     def test_address_group_list(self):
         arglist = []
@@ -341,7 +341,7 @@ def setUp(self):
             return_value=self._address_group
         )
         # Get the command object to test
-        self.cmd = address_group.SetAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.SetAddressGroup(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -447,7 +447,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_group.ShowAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.ShowAddressGroup(self.app, None)
 
     def test_show_no_options(self):
         arglist = []
@@ -493,7 +493,7 @@ def setUp(self):
             return_value=self._address_group
         )
         # Get the command object to test
-        self.cmd = address_group.UnsetAddressGroup(self.app, self.namespace)
+        self.cmd = address_group.UnsetAddressGroup(self.app, None)
 
     def test_unset_nothing(self):
         arglist = [

openstackclient/tests/unit/network/v2/test_address_scope.py

@@ -57,7 +57,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_scope.CreateAddressScope(self.app, self.namespace)
+        self.cmd = address_scope.CreateAddressScope(self.app, None)
 
         self.projects_mock.get.return_value = self.project
         self.domains_mock.get.return_value = self.domain
@@ -168,7 +168,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_scope.DeleteAddressScope(self.app, self.namespace)
+        self.cmd = address_scope.DeleteAddressScope(self.app, None)
 
     def test_address_scope_delete(self):
         arglist = [
@@ -272,7 +272,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_scope.ListAddressScope(self.app, self.namespace)
+        self.cmd = address_scope.ListAddressScope(self.app, None)
 
     def test_address_scope_list(self):
         arglist = []
@@ -404,7 +404,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_scope.SetAddressScope(self.app, self.namespace)
+        self.cmd = address_scope.SetAddressScope(self.app, None)
 
     def test_set_nothing(self):
         arglist = [
@@ -493,7 +493,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = address_scope.ShowAddressScope(self.app, self.namespace)
+        self.cmd = address_scope.ShowAddressScope(self.app, None)
 
     def test_show_no_options(self):
         arglist = []

openstackclient/tests/unit/network/v2/test_default_security_group_rule.py

@@ -105,7 +105,7 @@ def setUp(self):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.CreateDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_create_all_remote_options(self):
@@ -848,7 +848,7 @@ def setUp(self):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.DeleteDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_default_security_group_rule_delete(self):
@@ -985,7 +985,7 @@ def setUp(self):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.ListDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_list_default(self):
@@ -1107,7 +1107,7 @@ def setUp(self):
 
         # Get the command object to test
         self.cmd = default_security_group_rule.ShowDefaultSecurityGroupRule(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):

openstackclient/tests/unit/network/v2/test_floating_ip_network.py

@@ -95,7 +95,7 @@ def setUp(self):
         self.network_client.find_port = mock.Mock(return_value=self.port)
 
         # Get the command object to test
-        self.cmd = fip.CreateFloatingIP(self.app, self.namespace)
+        self.cmd = fip.CreateFloatingIP(self.app, None)
 
     def test_create_no_options(self):
         arglist = []
@@ -306,7 +306,7 @@ def setUp(self):
         self.network_client.delete_ip = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.DeleteFloatingIP(self.app, self.namespace)
+        self.cmd = fip.DeleteFloatingIP(self.app, None)
 
     def test_floating_ip_delete(self):
         self.network_client.find_ip.side_effect = [
@@ -479,7 +479,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = fip.ListFloatingIP(self.app, self.namespace)
+        self.cmd = fip.ListFloatingIP(self.app, None)
 
     def test_floating_ip_list(self):
         arglist = []
@@ -747,7 +747,7 @@ def setUp(self):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
 
         # Get the command object to test
-        self.cmd = fip.ShowFloatingIP(self.app, self.namespace)
+        self.cmd = fip.ShowFloatingIP(self.app, None)
 
     def test_floating_ip_show(self):
         arglist = [
@@ -791,7 +791,7 @@ def setUp(self):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.SetFloatingIP(self.app, self.namespace)
+        self.cmd = fip.SetFloatingIP(self.app, None)
 
     def test_port_option(self):
         arglist = [
@@ -1041,7 +1041,7 @@ def setUp(self):
         self.network_client.set_tags = mock.Mock(return_value=None)
 
         # Get the command object to test
-        self.cmd = fip.UnsetFloatingIP(self.app, self.namespace)
+        self.cmd = fip.UnsetFloatingIP(self.app, None)
 
     def test_floating_ip_unset_port(self):
         arglist = [

openstackclient/tests/unit/network/v2/test_floating_ip_pool_network.py

@@ -27,9 +27,7 @@ def setUp(self):
         super(TestListFloatingIPPoolNetwork, self).setUp()
 
         # Get the command object to test
-        self.cmd = floating_ip_pool.ListFloatingIPPool(
-            self.app, self.namespace
-        )
+        self.cmd = floating_ip_pool.ListFloatingIPPool(self.app, None)
 
     def test_floating_ip_list(self):
         arglist = []

openstackclient/tests/unit/network/v2/test_floating_ip_port_forwarding.py

@@ -62,7 +62,7 @@ def setUp(self):
 
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.CreateFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
         self.columns = (
@@ -358,7 +358,7 @@ def setUp(self):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.DeleteFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_port_forwarding_delete(self):
@@ -496,7 +496,7 @@ def setUp(self):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ListFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_port_forwarding_list(self):
@@ -567,7 +567,7 @@ def setUp(self):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.SetFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_set_nothing(self):
@@ -696,7 +696,7 @@ def setUp(self):
         self.network_client.find_ip = mock.Mock(return_value=self.floating_ip)
         # Get the command object to test
         self.cmd = floating_ip_port_forwarding.ShowFloatingIPPortForwarding(
-            self.app, self.namespace
+            self.app, None
         )
 
     def test_show_no_options(self):

openstackclient/tests/unit/network/v2/test_ip_availability.py

@@ -54,7 +54,7 @@ class TestListIPAvailability(TestIPAvailability):
     def setUp(self):
         super(TestListIPAvailability, self).setUp()
 
-        self.cmd = ip_availability.ListIPAvailability(self.app, self.namespace)
+        self.cmd = ip_availability.ListIPAvailability(self.app, None)
         self.network_client.network_ip_availabilities = mock.Mock(
             return_value=self._ip_availability
         )
@@ -142,7 +142,7 @@ def setUp(self):
         )
 
         # Get the command object to test
-        self.cmd = ip_availability.ShowIPAvailability(self.app, self.namespace)
+        self.cmd = ip_availability.ShowIPAvailability(self.app, None)
 
     def test_show_no_option(self):
         arglist = []