diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-19 14:40:01 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-19 14:40:01 +0100 |
| commit | 71d8ada4a9335075014f41798fa1684be6c148d9 (patch) | |
| tree | afa51cb6829c266341496b614d1a03afa378d3f3 /python | |
| parent | e0baeba546f8f45bc1ec981a60b615a28f4142af (diff) | |
| parent | 22198ec1941581b09dc4b3f76702a6b744eab818 (diff) | |
| download | UXP-71d8ada4a9335075014f41798fa1684be6c148d9.tar UXP-71d8ada4a9335075014f41798fa1684be6c148d9.tar.gz UXP-71d8ada4a9335075014f41798fa1684be6c148d9.tar.lz UXP-71d8ada4a9335075014f41798fa1684be6c148d9.tar.xz UXP-71d8ada4a9335075014f41798fa1684be6c148d9.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'python')
| -rw-r--r-- | python/mozbuild/mozpack/packager/formats.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozpack/test/test_packager_formats.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index c4adabab0..cedd1998b 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -318,7 +318,7 @@ class OmniJarSubFormatter(PiecemealFormatter): path[1] in ['pref', 'preferences']) return path[0] in [ 'modules', - 'greprefs.js', + 'goanna.js', 'hyphenation', 'update.locale', ] or path[0] in STARTUP_CACHE_PATHS diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py index 1af4336b2..66a7cc8e6 100644 --- a/python/mozbuild/mozpack/test/test_packager_formats.py +++ b/python/mozbuild/mozpack/test/test_packager_formats.py @@ -405,13 +405,13 @@ class TestFormatters(unittest.TestCase): self.assertFalse( is_resource(base, 'defaults/preferences/channel-prefs.js')) self.assertTrue(is_resource(base, 'modules/foo.jsm')) - self.assertTrue(is_resource(base, 'greprefs.js')) + self.assertTrue(is_resource(base, 'goanna.js')) self.assertTrue(is_resource(base, 'hyphenation/foo')) self.assertTrue(is_resource(base, 'update.locale')) self.assertTrue( is_resource(base, 'jsloader/resource/gre/modules/foo.jsm')) self.assertFalse(is_resource(base, 'foo')) - self.assertFalse(is_resource(base, 'foo/bar/greprefs.js')) + self.assertFalse(is_resource(base, 'foo/bar/goanna.js')) self.assertTrue(is_resource(base, 'defaults/messenger/foo.dat')) self.assertFalse( is_resource(base, 'defaults/messenger/mailViews.dat')) |