diff --git a/src/postorius/tests/__init__.py b/src/postorius/tests/__init__.py index 2374145..e69de29 100644 --- a/src/postorius/tests/__init__.py +++ b/src/postorius/tests/__init__.py @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2012-2016 by the Free Software Foundation, Inc. -# -# This file is part of Postorius. -# -# Postorius is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# Postorius is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# Postorius. If not, see . - -import os - -from django.conf import settings -from mailmanclient.testing.vcr_helpers import get_vcr - - -TEST_ROOT = os.path.abspath(os.path.dirname(__file__)) - -FIXTURES_DIR = getattr( - settings, 'FIXTURES_DIR', - os.path.join(TEST_ROOT, 'fixtures')) - -VCR_RECORD_MODE = os.environ.get( - 'POSTORIUS_VCR_RECORD_MODE', - getattr(settings, 'VCR_RECORD_MODE', 'once')) - -MM_VCR = get_vcr( - cassette_library_dir=os.path.join(FIXTURES_DIR, 'vcr_cassettes'), - record_mode=VCR_RECORD_MODE, - ) diff --git a/src/postorius/tests/utils.py b/src/postorius/tests/utils.py index 850519b..b37ecfd 100644 --- a/src/postorius/tests/utils.py +++ b/src/postorius/tests/utils.py @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License along with # Postorius. If not, see . +import os import logging from django.conf import settings @@ -25,13 +26,26 @@ from six.moves.urllib_parse import quote from postorius.utils import get_client -from postorius.tests import MM_VCR - +from mailmanclient.testing.vcr_helpers import get_vcr vcr_log = logging.getLogger('vcr') vcr_log.setLevel(logging.WARNING) +TEST_ROOT = os.path.abspath(os.path.dirname(__file__)) + +FIXTURES_DIR = getattr(settings, 'FIXTURES_DIR', + os.path.join(TEST_ROOT, 'fixtures')) + +VCR_RECORD_MODE = os.environ.get('POSTORIUS_VCR_RECORD_MODE', + getattr(settings, 'VCR_RECORD_MODE', 'once')) + +MM_VCR = get_vcr( + cassette_library_dir=os.path.join(FIXTURES_DIR, 'vcr_cassettes'), + record_mode=VCR_RECORD_MODE, + ) + + def create_mock_domain(properties=None): """Create and return a mocked Domain.