diff --git a/tests/unit/helpers.py b/tests/unit/helpers.py index 6eb30406f..8642a7262 100644 --- a/tests/unit/helpers.py +++ b/tests/unit/helpers.py @@ -3,27 +3,7 @@ # See LICENSE file for licensing details. from pathlib import Path -from typing import Callable -from unittest.mock import patch import yaml METADATA = yaml.safe_load(Path("./metadata.yaml").read_text()) - - -def patch_network_get(private_address="10.1.157.116") -> Callable: - def network_get(*args, **kwargs) -> dict: - """Patch for the not-yet-implemented testing backend needed for `bind_address`. - - This patch decorator can be used for cases such as: - self.model.get_binding(event.relation).network.bind_address - """ - return { - "bind-addresses": [ - { - "addresses": [{"value": private_address}], - } - ] - } - - return patch("ops.testing._TestingModelBackend.network_get", network_get) diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index fbdaeeff0..ba222a6c9 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -23,8 +23,6 @@ from charm import MongoDBCharm, NotReadyError -from .helpers import patch_network_get - PYMONGO_EXCEPTIONS = [ (ConnectionFailure("error message"), ConnectionFailure), (ConfigurationError("error message"), ConfigurationError), @@ -37,7 +35,6 @@ class TestCharm(unittest.TestCase): @patch("charm.get_charm_revision") - @patch_network_get(private_address="1.1.1.1") def setUp(self, *unused): self.maxDiff = None self.harness = Harness(MongoDBCharm) @@ -1047,7 +1044,6 @@ def test_set_password_provided(self, connection): # verify app data is updated and results are reported to user self.assertEqual("canonical123", new_password) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBCharm.has_backup_service") @patch("charm.MongoDBBackups.get_pbm_status") def test_set_backup_password_pbm_busy(self, pbm_status, has_backup_service): diff --git a/tests/unit/test_mongodb_backups.py b/tests/unit/test_mongodb_backups.py index 7f0a5eb17..05e33cc10 100644 --- a/tests/unit/test_mongodb_backups.py +++ b/tests/unit/test_mongodb_backups.py @@ -25,14 +25,11 @@ from charm import MongoDBCharm -from .helpers import patch_network_get - RELATION_NAME = "s3-credentials" class TestMongoBackups(unittest.TestCase): @patch("charm.get_charm_revision") - @patch_network_get(private_address="1.1.1.1") def setUp(self, *unused): self.harness = Harness(MongoDBCharm) self.harness.begin() @@ -269,7 +266,6 @@ def test_s3_credentials_no_db(self, defer): defer.assert_called() - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBCharm.has_backup_service") @patch("charm.MongoDBBackups._set_config_options") def test_s3_credentials_set_pbm_failure(self, _set_config_options, service): @@ -295,7 +291,6 @@ def test_s3_credentials_set_pbm_failure(self, _set_config_options, service): self.assertTrue(isinstance(self.harness.charm.unit.status, BlockedStatus)) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBBackups._set_config_options") @patch("charm.MongoDBBackups._resync_config_options") @patch("ops.framework.EventBase.defer") @@ -325,7 +320,6 @@ def test_s3_credentials_config_error( ) self.assertTrue(isinstance(self.harness.charm.unit.status, BlockedStatus)) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBBackups._set_config_options") @patch("charm.MongoDBBackups._resync_config_options") @patch("ops.framework.EventBase.defer") @@ -354,7 +348,6 @@ def test_s3_credentials_syncing(self, pbm_status, service, defer, resync, _set_c defer.assert_called() self.assertTrue(isinstance(self.harness.charm.unit.status, WaitingStatus)) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBBackups._set_config_options") @patch("charm.MongoDBBackups._resync_config_options") @patch("ops.framework.EventBase.defer") @@ -386,7 +379,6 @@ def test_s3_credentials_pbm_busy( defer.assert_called() self.assertTrue(isinstance(self.harness.charm.unit.status, WaitingStatus)) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBBackups._set_config_options") @patch("charm.MongoDBBackups._resync_config_options") @patch("ops.framework.EventBase.defer") diff --git a/tests/unit/test_mongodb_provider.py b/tests/unit/test_mongodb_provider.py index 2c421b86b..74b753202 100644 --- a/tests/unit/test_mongodb_provider.py +++ b/tests/unit/test_mongodb_provider.py @@ -12,8 +12,6 @@ from charm import MongoDBCharm -from .helpers import patch_network_get - PYMONGO_EXCEPTIONS = [ (ConnectionFailure("error message"), ConnectionFailure), (ConfigurationError("error message"), ConfigurationError), @@ -26,7 +24,6 @@ class TestMongoProvider(unittest.TestCase): @patch("charm.get_charm_revision") - @patch_network_get(private_address="1.1.1.1") def setUp(self, *unused): self.harness = Harness(MongoDBCharm) mongo_resource = { @@ -88,7 +85,6 @@ def test_relation_event_oversee_users_mongo_failure(self, oversee_users, defer, defer.assert_called() # oversee_users raises AssertionError when unable to attain users from relation - @patch_network_get(private_address="1.1.1.1") @patch("charm.CrossAppVersionChecker.is_local_charm") @patch("charms.mongodb.v0.set_status.get_charm_revision") @patch("ops.framework.EventBase.defer") @@ -112,7 +108,6 @@ def test_relation_event_oversee_users_fails_to_get_relation(self, oversee_users, else: self.harness.remove_relation_unit(relation_id, "consumer/0") - @patch_network_get(private_address="1.1.1.1") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") def test_oversee_users_get_users_failure(self, connection): """Verifies that when unable to retrieve users from mongod an exception is raised.""" @@ -124,7 +119,6 @@ def test_oversee_users_get_users_failure(self, connection): dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") def test_oversee_users_drop_user_failure(self, connection, relation_users): @@ -146,7 +140,6 @@ def test_oversee_users_drop_user_failure(self, connection, relation_users): dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") def test_oversee_users_get_config_failure(self, connection, relation_users): @@ -163,7 +156,6 @@ def test_oversee_users_get_config_failure(self, connection, relation_users): dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._set_relation") @patch("charm.MongoDBProvider._get_config") @patch("charm.MongoDBProvider._get_users_from_relations") @@ -186,7 +178,6 @@ def test_oversee_users_no_config_database( connection.return_value.__enter__.return_value.create_user.assert_not_called() set_relation.assert_not_called() - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._set_relation") @patch("charm.MongoDBProvider._get_config") @patch("charm.MongoDBProvider._get_users_from_relations") @@ -208,7 +199,6 @@ def test_oversee_users_create_user_failure( ) set_relation.assert_not_called() - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_config") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") @@ -228,7 +218,6 @@ def test_oversee_users_set_relation_failure(self, connection, relation_users, ge dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") def test_oversee_users_update_get_config_failure(self, connection, relation_users): @@ -245,7 +234,6 @@ def test_oversee_users_update_get_config_failure(self, connection, relation_user dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_config") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") @@ -265,7 +253,6 @@ def test_oversee_users_update_user_failure(self, connection, relation_users, get dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_databases_from_relations") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") @@ -283,7 +270,6 @@ def test_oversee_users_no_auto_delete( ) connection.return_value.__enter__.return_value.drop_database.assert_not_called() - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection") def test_oversee_users_mongo_databases_failure(self, connection, relation_users): @@ -300,7 +286,6 @@ def test_oversee_users_mongo_databases_failure(self, connection, relation_users) dep_id, RelationEvent(mock.Mock(), mock.Mock()) ) - @patch_network_get(private_address="1.1.1.1") @patch("charm.MongoDBProvider._get_databases_from_relations") @patch("charm.MongoDBProvider._get_users_from_relations") @patch("charms.mongodb.v1.mongodb_provider.MongoConnection")