From 3c5dac9035de9d0604737b293317596b798b27b6 Mon Sep 17 00:00:00 2001 From: Agate Date: Thu, 28 Jul 2022 14:32:46 +0200 Subject: [PATCH 5/5] Fix schemas tests under django 3.2 (#67760) --- tests_schemas/test_cook.py | 12 ++++++------ tests_schemas/test_rename_hobo_service.py | 10 +++++----- tests_schemas/test_rename_service.py | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests_schemas/test_cook.py b/tests_schemas/test_cook.py index f751687..2b924ee 100644 --- a/tests_schemas/test_cook.py +++ b/tests_schemas/test_cook.py @@ -5,18 +5,18 @@ from django.core.management import call_command, load_command_class from django.core.management.base import CommandError from hobo.deploy.utils import get_hobo_json -from hobo.environment.models import ServiceBase +from hobo.environment import models as environment_models def test_cook(db, fake_notify, monkeypatch): - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True) - monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True) + monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True) call_command('cook', 'tests_schemas/recipe.json') assert len(fake_notify) == 3 def test_cook_unresolvable(db, fake_notify, monkeypatch): - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: False) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: False) with pytest.raises(CommandError) as e_info: call_command('cook', 'tests_schemas/recipe.json') assert 'is not resolvable' in str(e_info.value) @@ -26,8 +26,8 @@ def test_cook_example(db, fake_notify, monkeypatch, fake_themes): """hobo/cook (before rabbitmq) scenario having templates. the resulting JSON may be helpfull to manually invoque hobo-deploy (after rabbitmq) """ - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True) - monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True) + monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True) call_command('cook', 'tests_schemas/example_recipe.json') # notify_agents was call diff --git a/tests_schemas/test_rename_hobo_service.py b/tests_schemas/test_rename_hobo_service.py index c8a0f0c..a4ef988 100644 --- a/tests_schemas/test_rename_hobo_service.py +++ b/tests_schemas/test_rename_hobo_service.py @@ -4,15 +4,15 @@ from django.core.management.base import CommandError from mock import Mock from tenant_schemas.utils import tenant_context -from hobo.environment.models import Passerelle, ServiceBase +from hobo.environment import models as environment_models from hobo.environment.utils import get_installed_services, get_or_create_local_hobo from hobo.multitenant.middleware import TenantMiddleware, TenantNotFound @pytest.fixture() def hobo_tenant(db, fake_notify, monkeypatch, fake_themes): - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True) - monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True) + monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True) yield call_command('cook', 'tests_schemas/example_recipe.json') call_command('delete_tenant', 'hobo-instance-name.dev.signalpublik.com') @@ -33,8 +33,8 @@ def test_unknown_service(hobo_tenant): def test_rename_hobo_service_succes(db, fake_notify, monkeypatch, fake_themes): - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True) - monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True) + monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True) call_command('cook', 'tests_schemas/example_recipe.json') assert TenantMiddleware.get_tenant_by_hostname('hobo-instance-name.dev.signalpublik.com') call_command( diff --git a/tests_schemas/test_rename_service.py b/tests_schemas/test_rename_service.py index 61c6998..b3d202f 100644 --- a/tests_schemas/test_rename_service.py +++ b/tests_schemas/test_rename_service.py @@ -4,15 +4,15 @@ from django.core.management.base import CommandError from mock import Mock from tenant_schemas.utils import tenant_context -from hobo.environment.models import Passerelle, ServiceBase +from hobo.environment import models as environment_models from hobo.environment.utils import get_installed_services from hobo.multitenant.middleware import TenantMiddleware @pytest.fixture() def hobo_tenant(db, fake_notify, monkeypatch, fake_themes): - monkeypatch.setattr(ServiceBase, 'is_resolvable', lambda x: True) - monkeypatch.setattr(ServiceBase, 'has_valid_certificate', lambda x: True) + monkeypatch.setattr(environment_models, 'is_resolvable', lambda x: True) + monkeypatch.setattr(environment_models, 'has_valid_certificate', lambda x: True) yield call_command('cook', 'tests_schemas/example_recipe.json') call_command('delete_tenant', 'hobo-instance-name.dev.signalpublik.com') @@ -34,7 +34,7 @@ def test_secondary_service(hobo_tenant): tenant = TenantMiddleware.get_tenant_by_hostname('hobo-instance-name.dev.signalpublik.com') with tenant_context(tenant): assert get_installed_services() - Passerelle.objects.create( + environment_models.Passerelle.objects.create( title='other passerelle', slug='other-passerelle', base_url='https://other-passerelle-instance-name.dev.signalpublik.com', @@ -55,8 +55,8 @@ def test_secondary_service(hobo_tenant): def test_rename_service_succes(hobo_tenant, monkeypatch): tenant = TenantMiddleware.get_tenant_by_hostname('hobo-instance-name.dev.signalpublik.com') with tenant_context(tenant): - assert Passerelle.objects.count() == 1 - passerelle_service = Passerelle.objects.first() + assert environment_models.Passerelle.objects.count() == 1 + passerelle_service = environment_models.Passerelle.objects.first() assert ( passerelle_service.get_base_url_path() == 'https://passerelle-instance-name.dev.signalpublik.com/' ) @@ -68,8 +68,8 @@ def test_rename_service_succes(hobo_tenant, monkeypatch): 'https://passerelle-instance-name.dev.signalpublik.com/', 'https://new-passerelle-instance-name.dev.signalpublik.com/', ) - assert Passerelle.objects.count() == 1 - passerelle_service = Passerelle.objects.first() + assert environment_models.Passerelle.objects.count() == 1 + passerelle_service = environment_models.Passerelle.objects.first() assert ( passerelle_service.get_base_url_path() == 'https://new-passerelle-instance-name.dev.signalpublik.com/' -- 2.36.1