diff --git a/python/mozbuild/README.rst b/python/mozbuild/README.rst index 7256b9ee0f5f..bd621fae3550 100644 --- a/python/mozbuild/README.rst +++ b/python/mozbuild/README.rst @@ -10,5 +10,4 @@ Modules Overview * mozbuild.compilation -- Functionality related to compiling. This includes managing compiler warnings. -* mozbuild.testing -- Interfaces for running tests. diff --git a/python/mozbuild/mozbuild/test/test_base.py b/python/mozbuild/mozbuild/test/test_base.py index 5206492a98ab..5b9f0fdf3425 100644 --- a/python/mozbuild/mozbuild/test/test_base.py +++ b/python/mozbuild/mozbuild/test/test_base.py @@ -9,10 +9,12 @@ import unittest from tempfile import NamedTemporaryFile -from mozbuild.base import BuildConfig -from mozbuild.base import MozbuildObject -from mozbuild.config import ConfigSettings -from mozbuild.logger import LoggingManager +from mach.logging import LoggingManager + +from mozbuild.base import ( + BuildConfig, + MozbuildObject, +) curdir = os.path.dirname(__file__) @@ -20,20 +22,9 @@ topsrcdir = os.path.normpath(os.path.join(curdir, '..', '..', '..', '..')) log_manager = LoggingManager() -class TestBuildConfig(unittest.TestCase): - def test_basic(self): - c = ConfigSettings() - c.register_provider(BuildConfig) - - c.build.threads = 6 - - class TestMozbuildObject(unittest.TestCase): def get_base(self): - settings = ConfigSettings() - settings.register_provider(BuildConfig) - - return MozbuildObject(topsrcdir, settings, log_manager) + return MozbuildObject(topsrcdir, None, log_manager) def test_mozconfig_parsing(self): with NamedTemporaryFile(mode='wt') as mozconfig: