829664 - `make check` fails on mozbuild/test/test_mozconfig.py with MOZCONFIG set

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jeff Hammel]

TEST-UNEXPECTED-FAIL | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | line 148, test_read_no_mozconfig: {u'topobjdir': u'/tmp/tmp69WgvG/../obj-browser', u'make_flags': [], u'env': {u'u [truncated]... != {u'topobjdir': None, u'make_flags': None, u'env': None, u'path': None, u'make_ex [truncated]...
Diff is 3892 characters long. Set self.maxDiff to None to see it.

I have the MOZCONFIG environment variable set:

MOZCONFIG=/home/jhammel/mozilla/mozconfigs/mozconfig

If I unset this, the test works fine.  The test should unset the variable to ensure it passes

Comment 1

[Jeff Hammel]

Actually there are a few more failures:

TEST-UNEXPECTED-FAIL | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | line 89, test_find_default_files: '/home/jhammel/mozilla/mozconfigs/mozconfig' != u'/tmp/tmp35oud4/.mozconfig'
TEST-UNEXPECTED-FAIL | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | line 132, test_find_deprecated_home_paths: MozconfigFindException not raised
TEST-UNEXPECTED-FAIL | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | line 114, test_find_deprecated_path_srcdir: MozconfigFindException not raised
TEST-PASS | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | test_find_legacy_env
TEST-UNEXPECTED-FAIL | /home/jhammel/mozilla/src/mozilla-central/python/mozbuild/mozbuild/test/test_mozconfig.py | line 101, test_find_multiple_defaults: MozconfigFindException not raised

Comment 2

[Jeff Hammel]

Attachment: pop the MOZCONFIG environment variable

Comment 3

[Gregory Szorc [:gps]]

Comment on attachment 701183 [details] [diff] [review]
pop the MOZCONFIG environment variable

Review of attachment 701183 [details] [diff] [review]:
-----------------------------------------------------------------

I love simple patches!

::: python/mozbuild/mozbuild/test/test_mozconfig.py
@@ +27,5 @@
>  
>  class TestMozconfigLoader(unittest.TestCase):
>      def setUp(self):
>          self._old_env = dict(os.environ)
> +        self._mozconfig = os.environ.pop('MOZCONFIG', None)

Since you don't do anything with self._mozconfig, I'd just not store it.

Comment 4

[Jeff Hammel]

> Since you don't do anything with self._mozconfig, I'd just not store it.

Good call. I was intended to set it back but then realized that the old environment was already restored so I didn't need to; Will fix on checkin

Comment 5

[Jeff Hammel]

pushed to inbound: https://hg.mozilla.org/integration/mozilla-inbound/rev/15d99c7eb660

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/15d99c7eb660