From 28e0c460181c7d12cf5f6fa78ae4d53d9471abeb Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 28 Apr 2018 15:32:49 +0200 Subject: [PATCH 1/2] tests_multitenant: PEP8ness and cleanup (#15470) --- tests_multitenant/test_tenant_command.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests_multitenant/test_tenant_command.py b/tests_multitenant/test_tenant_command.py index bd7b473..d416d2f 100644 --- a/tests_multitenant/test_tenant_command.py +++ b/tests_multitenant/test_tenant_command.py @@ -2,8 +2,13 @@ import pytest import mock import os +from django.core.management import execute_from_command_line + +from hobo.multitenant.middleware import TenantMiddleware + pytestmark = pytest.mark.django_db + class RecordTenant(object): def __init__(self): self.tenants = [] @@ -12,9 +17,9 @@ class RecordTenant(object): from django.db import connection self.tenants.append(connection.tenant) + @mock.patch('django.contrib.sessions.management.commands.clearsessions.Command.handle') def test_all_tenants(handle, tenants): - from django.core.management import execute_from_command_line handle.side_effect = RecordTenant() execute_from_command_line(['manage.py', 'tenant_command', 'clearsessions', '--all-tenants']) assert handle.call_count == 2 @@ -22,21 +27,21 @@ def test_all_tenants(handle, tenants): assert set(tenant.domain_url for tenant in handle.side_effect.tenants) == \ set(['tenant1.example.net', 'tenant2.example.net']) + @mock.patch('django.contrib.sessions.management.commands.clearsessions.Command.handle') def test_one_tenant(handle, tenants, tenant_in_call=None): - from django.core.management import execute_from_command_line handle.side_effect = RecordTenant() execute_from_command_line(['manage.py', 'tenant_command', 'clearsessions', '-d', 'tenant2.example.net']) assert handle.call_count == 1 assert len(handle.side_effect.tenants) == 1 assert handle.side_effect.tenants[0].domain_url == 'tenant2.example.net' + def test_delete_tenant(tenants): - from django.core.management import execute_from_command_line - from hobo.multitenant.middleware import TenantMiddleware base = os.path.dirname(tenants[0].get_directory()) if any('removed' in d for d in os.listdir(base)): assert False + def get_schemas(): from django.db import connection cursor = connection.cursor() @@ -47,9 +52,9 @@ def test_delete_tenant(tenants): all_tenants = list(TenantMiddleware.get_tenants()) assert len(all_tenants) == 2 execute_from_command_line(['manage.py', 'delete_tenant', 'tenant2.example.net']) - if not any('removed' in d for d in os.listdir(base)): + if not any('removed' in d for d in os.listdir(base)): assert False if not any('removed' in x for x in get_schemas()): - assert False + assert False all_tenants = list(TenantMiddleware.get_tenants()) assert len(all_tenants) == 1 -- 2.17.0