Skip to content

Commit f02ba1e

Browse files
committed
fix: use TEST_ENVIRONMENT envvar in email validator tester rather than manipulating domain list
1 parent d4c685c commit f02ba1e

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

tests/conftest.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging # noqa: F401
2+
import sys
23
from datetime import datetime
34
from unittest import mock
4-
import sys
55

66
import email_validator
77
import pytest
@@ -11,35 +11,33 @@
1111
from sqlalchemy.pool import NullPool
1212

1313
from mavedb.db.base import Base
14+
from mavedb.models import * # noqa: F403
15+
from mavedb.models.experiment import Experiment
1416
from mavedb.models.experiment_set import ExperimentSet
15-
from mavedb.models.score_set_publication_identifier import ScoreSetPublicationIdentifierAssociation
16-
from mavedb.models.user import User, UserRole, Role
1717
from mavedb.models.license import License
18-
from mavedb.models.taxonomy import Taxonomy
19-
from mavedb.models.publication_identifier import PublicationIdentifier
20-
from mavedb.models.experiment import Experiment
21-
from mavedb.models.variant import Variant
2218
from mavedb.models.mapped_variant import MappedVariant
19+
from mavedb.models.publication_identifier import PublicationIdentifier
2320
from mavedb.models.score_set import ScoreSet
24-
25-
from mavedb.models import * # noqa: F403
26-
21+
from mavedb.models.score_set_publication_identifier import ScoreSetPublicationIdentifierAssociation
22+
from mavedb.models.taxonomy import Taxonomy
23+
from mavedb.models.user import Role, User, UserRole
24+
from mavedb.models.variant import Variant
2725
from tests.helpers.constants import (
2826
ADMIN_USER,
2927
EXTRA_USER,
30-
TEST_LICENSE,
28+
TEST_BRNICH_SCORE_CALIBRATION,
3129
TEST_INACTIVE_LICENSE,
30+
TEST_LICENSE,
31+
TEST_PATHOGENICITY_SCORE_CALIBRATION,
32+
TEST_PUBMED_IDENTIFIER,
3233
TEST_SAVED_TAXONOMY,
3334
TEST_USER,
34-
VALID_VARIANT_URN,
35-
VALID_SCORE_SET_URN,
36-
VALID_EXPERIMENT_URN,
37-
VALID_EXPERIMENT_SET_URN,
38-
TEST_PUBMED_IDENTIFIER,
3935
TEST_VALID_POST_MAPPED_VRS_ALLELE_VRS2_X,
4036
TEST_VALID_PRE_MAPPED_VRS_ALLELE_VRS2_X,
41-
TEST_BRNICH_SCORE_CALIBRATION,
42-
TEST_PATHOGENICITY_SCORE_CALIBRATION,
37+
VALID_EXPERIMENT_SET_URN,
38+
VALID_EXPERIMENT_URN,
39+
VALID_SCORE_SET_URN,
40+
VALID_VARIANT_URN,
4341
)
4442

4543
sys.path.append(".")
@@ -56,7 +54,7 @@
5654
assert pytest_postgresql.factories
5755

5856
# Allow the @test domain name through our email validator.
59-
email_validator.SPECIAL_USE_DOMAIN_NAMES.remove("test")
57+
email_validator.TEST_ENVIRONMENT = True
6058

6159

6260
@pytest.fixture()

0 commit comments

Comments
 (0)