Merge "tests: Avoid more unnecessary mocks"

Author: Zuul

openstackclient/tests/unit/common/test_extension.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from unittest import mock
 
 from openstackclient.common import extension
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -295,8 +294,8 @@ def setUp(self):
 
  self.cmd = extension.ShowExtension(self.app, None)
 
- self.app.client_manager.network.find_extension = mock.Mock(
- return_value=self.extension_details
+ self.app.client_manager.network.find_extension.return_value = (
+ self.extension_details
  )
 
  def test_show_no_options(self):

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

@@ -165,9 +165,11 @@ def setUp(self):
  sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2)
  )
 
- self.compute_client.find_aggregate = mock.Mock(
- side_effect=[self.fake_ags[0], self.fake_ags[1]]
- )
+ self.compute_client.find_aggregate.side_effect = [
+ self.fake_ags[0],
+ self.fake_ags[1],
+ ]
+
  self.cmd = aggregate.DeleteAggregate(self.app, None)
 
  def test_aggregate_delete(self):

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

@@ -13,7 +13,6 @@
 # under the License.
 #
 
-from unittest import mock
 
 from openstack.compute.v2 import server as _server
 from openstack.test import fakes as sdk_fakes
@@ -90,9 +89,7 @@ def setUp(self):
  'protocol': 'fake_protocol',
  'type': 'fake_type',
  }
- self.compute_client.create_console = mock.Mock(
- return_value=fake_console_data
- )
+ self.compute_client.create_console.return_value = fake_console_data
 
  self.columns = (
  'protocol',

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

@@ -680,9 +680,7 @@ def test_flavor_list_long_no_extra_specs(self):
  )
 
  self.compute_client.flavors.side_effect = [[flavor], []]
- self.compute_client.fetch_flavor_extra_specs = mock.Mock(
- return_value=None
- )
+ self.compute_client.fetch_flavor_extra_specs.return_value = None
 
  arglist = [
  '--long',

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

@@ -12,20 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-from unittest import mock
 
 from openstackclient.compute.v2 import hypervisor_stats
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import fakes
 
 
-class TestHypervisorStats(compute_fakes.TestComputev2):
- def setUp(self):
- super().setUp()
-
- self.compute_client.get = mock.Mock()
-
-
 # Not in fakes.py because hypervisor stats has been deprecated
 
 
@@ -61,7 +53,7 @@ def create_one_hypervisor_stats(attrs=None):
  return stats_info
 
 
-class TestHypervisorStatsShow(TestHypervisorStats):
+class TestHypervisorStatsShow(compute_fakes.TestComputev2):
  _stats = create_one_hypervisor_stats()
 
  def setUp(self):

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

@@ -161,9 +161,7 @@ def test_server_backup_wait_fail(self, mock_wait_for_status):
 
  @mock.patch.object(common_utils, 'wait_for_status', return_value=True)
  def test_server_backup_wait_ok(self, mock_wait_for_status):
- self.image_client.get_image = mock.Mock(
- side_effect=self.image,
- )
+ self.image_client.get_image.side_effect = (self.image,)
 
  arglist = [
  '--name',

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

@@ -77,9 +77,7 @@ def test_multi_services_delete_with_exception(self):
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
  delete_mock_result = [None, exceptions.CommandError]
- self.compute_client.delete_service = mock.Mock(
- side_effect=delete_mock_result
- )
+ self.compute_client.delete_service.side_effect = delete_mock_result
 
  try:
  self.cmd.take_action(parsed_args)

openstackclient/tests/unit/network/test_common.py

@@ -128,15 +128,11 @@ def setUp(self):
 
  self.app.client_manager.network = mock.Mock()
  self.network_client = self.app.client_manager.network
- self.network_client.network_action = mock.Mock(
- return_value='take_action_network'
- )
+ self.network_client.network_action.return_value = 'take_action_network'
 
  self.app.client_manager.compute = mock.Mock()
  self.compute_client = self.app.client_manager.compute
- self.compute_client.compute_action = mock.Mock(
- return_value='take_action_compute'
- )
+ self.compute_client.compute_action.return_value = 'take_action_compute'
 
  self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 

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

@@ -11,7 +11,6 @@
 # under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib import exceptions
@@ -58,8 +57,8 @@ class TestCreateAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.create_address_group = mock.Mock(
- return_value=self.new_address_group
+ self.network_client.create_address_group.return_value = (
+ self.new_address_group
  )
 
  # Get the command object to test
@@ -145,7 +144,7 @@ class TestDeleteAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.delete_address_group = mock.Mock(return_value=None)
+ self.network_client.delete_address_group.return_value = None
  self.network_client.find_address_group = (
  network_fakes.get_address_groups(
  address_groups=self._address_groups
@@ -206,9 +205,7 @@ def test_multi_address_groups_delete_with_exception(self):
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
  find_mock_result = [self._address_groups[0], exceptions.CommandError]
- self.network_client.find_address_group = mock.Mock(
- side_effect=find_mock_result
- )
+ self.network_client.find_address_group.side_effect = find_mock_result
 
  try:
  self.cmd.take_action(parsed_args)
@@ -251,9 +248,7 @@ class TestListAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.address_groups = mock.Mock(
- return_value=self.address_groups
- )
+ self.network_client.address_groups.return_value = self.address_groups
 
  # Get the command object to test
  self.cmd = address_group.ListAddressGroup(self.app, None)
@@ -333,13 +328,15 @@ class TestSetAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.update_address_group = mock.Mock(return_value=None)
- self.network_client.find_address_group = mock.Mock(
- return_value=self._address_group
+ self.network_client.update_address_group.return_value = None
+ self.network_client.find_address_group.return_value = (
+ self._address_group
  )
- self.network_client.add_addresses_to_address_group = mock.Mock(
- return_value=self._address_group
+
+ self.network_client.add_addresses_to_address_group.return_value = (
+ self._address_group
  )
+
  # Get the command object to test
  self.cmd = address_group.SetAddressGroup(self.app, None)
 
@@ -442,8 +439,8 @@ class TestShowAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.find_address_group = mock.Mock(
- return_value=self._address_group
+ self.network_client.find_address_group.return_value = (
+ self._address_group
  )
 
  # Get the command object to test
@@ -486,12 +483,12 @@ class TestUnsetAddressGroup(TestAddressGroup):
 
  def setUp(self):
  super().setUp()
- self.network_client.find_address_group = mock.Mock(
- return_value=self._address_group
- )
- self.network_client.remove_addresses_from_address_group = mock.Mock(
- return_value=self._address_group
+ self.network_client.find_address_group.return_value = (
+ self._address_group
  )
+
+ self.network_client.remove_addresses_from_address_group.return_value = self._address_group
+
  # Get the command object to test
  self.cmd = address_group.UnsetAddressGroup(self.app, None)
 

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

@@ -11,7 +11,6 @@
 # under the License.
 #
 
-from unittest import mock
 from unittest.mock import call
 
 from osc_lib import exceptions
@@ -52,8 +51,8 @@ class TestCreateAddressScope(TestAddressScope):
 
  def setUp(self):
  super().setUp()
- self.network_client.create_address_scope = mock.Mock(
- return_value=self.new_address_scope
+ self.network_client.create_address_scope.return_value = (
+ self.new_address_scope
  )
 
  # Get the command object to test
@@ -160,7 +159,7 @@ class TestDeleteAddressScope(TestAddressScope):
 
  def setUp(self):
  super().setUp()
- self.network_client.delete_address_scope = mock.Mock(return_value=None)
+ self.network_client.delete_address_scope.return_value = None
  self.network_client.find_address_scope = (
  network_fakes.get_address_scopes(
  address_scopes=self._address_scopes
@@ -222,9 +221,7 @@ def test_multi_address_scopes_delete_with_exception(self):
  parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
  find_mock_result = [self._address_scopes[0], exceptions.CommandError]
- self.network_client.find_address_scope = mock.Mock(
- side_effect=find_mock_result
- )
+ self.network_client.find_address_scope.side_effect = find_mock_result
 
  try:
  self.cmd.take_action(parsed_args)
@@ -267,9 +264,7 @@ class TestListAddressScope(TestAddressScope):
 
  def setUp(self):
  super().setUp()
- self.network_client.address_scopes = mock.Mock(
- return_value=self.address_scopes
- )
+ self.network_client.address_scopes.return_value = self.address_scopes
 
  # Get the command object to test
  self.cmd = address_scope.ListAddressScope(self.app, None)
@@ -398,9 +393,9 @@ class TestSetAddressScope(TestAddressScope):
 
  def setUp(self):
  super().setUp()
- self.network_client.update_address_scope = mock.Mock(return_value=None)
- self.network_client.find_address_scope = mock.Mock(
- return_value=self._address_scope
+ self.network_client.update_address_scope.return_value = None
+ self.network_client.find_address_scope.return_value = (
+ self._address_scope
  )
 
  # Get the command object to test
@@ -488,8 +483,8 @@ class TestShowAddressScope(TestAddressScope):
 
  def setUp(self):
  super().setUp()
- self.network_client.find_address_scope = mock.Mock(
- return_value=self._address_scope
+ self.network_client.find_address_scope.return_value = (
+ self._address_scope
  )
 
  # Get the command object to test