From c93fc91e4dc0ef33e2ea418aaa32b0584a8d354a Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sun, 23 Jan 2022 13:44:36 -0500
Subject: [PATCH] Fix imports to get tests passing (#2751)

* Fix broken localization import in theme_tests.py
* Fix tests by importing directly from config submodule
* Fix test runner top level directory
---
 mkdocs/tests/base.py         | 3 ++-
 mkdocs/tests/plugin_tests.py | 7 ++++---
 mkdocs/tests/theme_tests.py  | 2 +-
 tox.ini                      | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mkdocs/tests/base.py b/mkdocs/tests/base.py
index cf425850..934f9570 100644
--- a/mkdocs/tests/base.py
+++ b/mkdocs/tests/base.py
@@ -6,6 +6,7 @@ from tempfile import TemporaryDirectory
 
 from mkdocs import config
 from mkdocs import utils
+from mkdocs.config import defaults as config_defaults
 
 
 def dedent(text):
@@ -32,7 +33,7 @@ def load_config(**cfg):
     if 'docs_dir' not in cfg:
         # Point to an actual dir to avoid a 'does not exist' error on validation.
         cfg['docs_dir'] = os.path.join(path_base, 'docs')
-    conf = config.Config(schema=config.defaults.get_schema(), config_file_path=cfg['config_file_path'])
+    conf = config.Config(schema=config_defaults.get_schema(), config_file_path=cfg['config_file_path'])
     conf.load_dict(cfg)
 
     errors_warnings = conf.validate()
diff --git a/mkdocs/tests/plugin_tests.py b/mkdocs/tests/plugin_tests.py
index 50955965..fa0e3d08 100644
--- a/mkdocs/tests/plugin_tests.py
+++ b/mkdocs/tests/plugin_tests.py
@@ -8,15 +8,16 @@ import os
 from mkdocs import plugins
 from mkdocs import config
 from mkdocs.commands import build
+from mkdocs.config import config_options
 from mkdocs.exceptions import BuildError, PluginError, Abort
 from mkdocs.tests.base import load_config
 
 
 class DummyPlugin(plugins.BasePlugin):
     config_scheme = (
-        ('foo', config.config_options.Type(str, default='default foo')),
-        ('bar', config.config_options.Type(int, default=0)),
-        ('dir', config.config_options.Dir(exists=False)),
+        ('foo', config_options.Type(str, default='default foo')),
+        ('bar', config_options.Type(int, default=0)),
+        ('dir', config_options.Dir(exists=False)),
     )
 
     def on_pre_page(self, content, **kwargs):
diff --git a/mkdocs/tests/theme_tests.py b/mkdocs/tests/theme_tests.py
index 3ccfb07b..296540af 100644
--- a/mkdocs/tests/theme_tests.py
+++ b/mkdocs/tests/theme_tests.py
@@ -5,7 +5,7 @@ from unittest import mock
 
 import mkdocs
 from mkdocs.theme import Theme
-from localization import parse_locale
+from mkdocs.localization import parse_locale
 
 abs_path = os.path.abspath(os.path.dirname(__file__))
 mkdocs_dir = os.path.abspath(os.path.dirname(mkdocs.__file__))
diff --git a/tox.ini b/tox.ini
index 51fc3daa..22e3fbc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps=
     py{36,37,38,39,310,py3}-{unittests,min-req}: -rrequirements/test.txt
 commands=
     {envpython} --version
-    py{36,37,38,39,310,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs
+    py{36,37,38,39,310,py3}-{unittests,min-req}:  {envbindir}/coverage run --source=mkdocs --omit 'mkdocs/tests/*' -m unittest discover -p '*tests.py' mkdocs --top-level-directory .
     py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage xml
     py{36,37,38,39,310,py3}-unittests: {envbindir}/coverage report --show-missing
     py{36,37,38,39,310,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds