diff --git a/manila/tests/scheduler/filters/test_json.py b/manila/tests/scheduler/filters/test_json.py index ba90c523b5..d0ad38c3db 100644 --- a/manila/tests/scheduler/filters/test_json.py +++ b/manila/tests/scheduler/filters/test_json.py @@ -270,7 +270,7 @@ class HostFiltersTestCase(test.TestCase): } host = fakes.FakeHostState('host1', {'capabilities': {'enabled': True}}) - self.assertTrue(self.filter.host_passes, (host, filter_properties)) + self.assertTrue(self.filter.host_passes(host, filter_properties)) def test_json_filter_empty_filters_pass(self): host = fakes.FakeHostState('host1', diff --git a/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py b/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py index 25d1732a8c..a6d98e9482 100644 --- a/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py +++ b/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py @@ -152,9 +152,10 @@ class NetAppFileStorageLibraryTestCase(test.TestCase): mock_set_cluster_info.assert_called_once() def test_set_cluster_info(self): + self.library._client.is_nve_supported.return_value = True + self.library._client.features.FLEXVOL_ENCRYPTION = True self.library._set_cluster_info() - self.assertTrue(self.library._cluster_info['nve_support'], - fake.CLUSTER_NODES) + self.assertTrue(self.library._cluster_info['nve_support']) def test_check_for_setup_error(self): mock_start_periodic_tasks = self.mock_object(self.library,