Bug 1467462 - Adjust test_developer_options after
bug 1467041. r?build
Bug 1467041 changed the default for --enable-release such that it is
affected by the milestone. Test both possible cases for milestones.
--- a/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py
@@ -3,35 +3,42 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, print_function, unicode_literals
import os
from buildconfig import topsrcdir
from common import BaseConfigureTest
-from mozunit import main
+from mozunit import MockedOpen, main
from mozbuild.configure.options import InvalidOptionError
class TestToolkitMozConfigure(BaseConfigureTest):
- def test_developer_options(self):
+ def test_developer_options(self, milestone='42.0a1'):
def get_value(args=[], environ={}):
sandbox = self.get_sandbox({}, {}, args, environ)
return sandbox._value_for(sandbox['developer_options'])
- self.assertEqual(get_value(), True)
+ milestone_path = os.path.join(topsrcdir, 'config', 'milestone.txt')
+ with MockedOpen({milestone_path: milestone}):
+ # developer options are enabled by default on "nightly" milestone
+ # only
+ self.assertEqual(get_value(), 'a' in milestone or None)
- self.assertEqual(get_value(['--enable-release']), None)
+ self.assertEqual(get_value(['--enable-release']), None)
- self.assertEqual(get_value(environ={'MOZILLA_OFFICIAL': 1}), None)
+ self.assertEqual(get_value(environ={'MOZILLA_OFFICIAL': 1}), None)
- self.assertEqual(get_value(['--enable-release'],
- environ={'MOZILLA_OFFICIAL': 1}), None)
+ self.assertEqual(get_value(['--enable-release'],
+ environ={'MOZILLA_OFFICIAL': 1}), None)
- with self.assertRaises(InvalidOptionError):
- get_value(['--disable-release'], environ={'MOZILLA_OFFICIAL': 1})
+ with self.assertRaises(InvalidOptionError):
+ get_value(['--disable-release'],
+ environ={'MOZILLA_OFFICIAL': 1})
- self.assertEqual(get_value(environ={'MOZ_AUTOMATION': 1}), None)
+ self.assertEqual(get_value(environ={'MOZ_AUTOMATION': 1}), None)
+ def test_developer_options_release(self):
+ self.test_developer_options('42.0')
if __name__ == '__main__':
main()