Bug 800633 - Clean up references to code moved out of mozbuild; r=jhammel
authorGregory Szorc <gps@mozilla.com>
Thu, 11 Oct 2012 17:13:18 -0700
changeset 110081 19cfc27b2c676298592f40fbcb4e5afb93bc4416
parent 110080 c200ffe949125c514998467d63754ab6187800c1
child 110082 1301a72b1c394543557d3e178cd3e0896463a3d3
child 110138 3455c181525a0fa4dff66d8a31dc5054568c2e4e
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersjhammel
bugs800633
milestone19.0a1
Bug 800633 - Clean up references to code moved out of mozbuild; r=jhammel DONTBUILD (NPOTB)
python/mozbuild/README.rst
python/mozbuild/mozbuild/test/test_base.py
--- a/python/mozbuild/README.rst
+++ b/python/mozbuild/README.rst
@@ -5,10 +5,9 @@ mozbuild
 mozbuild is a Python package providing functionality used by Mozilla's
 build system.
 
 Modules Overview
 ================
 
 * mozbuild.compilation -- Functionality related to compiling. This
   includes managing compiler warnings.
-* mozbuild.testing -- Interfaces for running tests.
 
--- a/python/mozbuild/mozbuild/test/test_base.py
+++ b/python/mozbuild/mozbuild/test/test_base.py
@@ -4,41 +4,32 @@
 
 from __future__ import unicode_literals
 
 import os
 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__)
 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:
             mozconfig.write('mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/some-objdir')
             mozconfig.flush()
 
             os.environ['MOZCONFIG'] = mozconfig.name