From 6c8a2375861fe0a2972d5df923f7803f714241b4 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Fri, 1 Sep 2017 10:59:49 +0200 Subject: [PATCH 1/2] bug 1382622, add environment to test python 2.7 with compare-locales, r=stas compare-locales doesn't support py3 yet, so we don't add that environment yet. This adds tox-travis, so that we can add dependency management in tox, and use travis to run individual jobs per python version. Compare-locales or not are run in the same travis job. --- .travis.yml | 4 +++- tox.ini | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91b2db18..a5d88297 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ +sudo: false language: python python: - "2.7" - "3.5" - "nightly" -script: python -m unittest discover +install: pip install tox-travis +script: tox notifications: irc: channels: diff --git a/tox.ini b/tox.ini index f775d92b..6515f039 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,11 @@ [tox] -envlist = py27, py36 +envlist = py27, py27-cl, py36 skipsdist=True [testenv] setenv = PYTHONPATH = {toxinidir} +deps = + cl: compare-locales + commands=python -m unittest discover From 14bf8dedaccd11b8510350cb314df326a5deb123 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Fri, 1 Sep 2017 11:07:38 +0200 Subject: [PATCH 2/2] bug 1382622, fix tests to use .val instead of .get_val(), r=stas The get_val wasn't really intended to be an API to begin with. Using the property .val is forwards and backwards compatible. --- tests/migrate/test_concat.py | 2 +- tests/migrate/test_literal.py | 2 +- tests/migrate/test_merge.py | 2 +- tests/migrate/test_plural.py | 2 +- tests/migrate/test_replace.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/migrate/test_concat.py b/tests/migrate/test_concat.py index 5ace475f..57de66f6 100644 --- a/tests/migrate/test_concat.py +++ b/tests/migrate/test_concat.py @@ -20,7 +20,7 @@ class MockContext(unittest.TestCase): def get_source(self, path, key): - return self.strings.get(key, None).get_val() + return self.strings.get(key, None).val @unittest.skipUnless(PropertiesParser, 'compare-locales required') diff --git a/tests/migrate/test_literal.py b/tests/migrate/test_literal.py index 6d248613..55e78a20 100644 --- a/tests/migrate/test_literal.py +++ b/tests/migrate/test_literal.py @@ -15,7 +15,7 @@ class MockContext(unittest.TestCase): def get_source(self, path, key): - return self.strings.get(key, None).get_val() + return self.strings.get(key, None).val @unittest.skipUnless(PropertiesParser, 'compare-locales required') diff --git a/tests/migrate/test_merge.py b/tests/migrate/test_merge.py index 8d987c29..fec6348d 100644 --- a/tests/migrate/test_merge.py +++ b/tests/migrate/test_merge.py @@ -18,7 +18,7 @@ class MockContext(unittest.TestCase): def get_source(self, path, key): - return self.ab_cd_legacy.get(key, None).get_val() + return self.ab_cd_legacy.get(key, None).val @unittest.skipUnless(PropertiesParser and DTDParser, diff --git a/tests/migrate/test_plural.py b/tests/migrate/test_plural.py index 8f2770a4..8e3e3723 100644 --- a/tests/migrate/test_plural.py +++ b/tests/migrate/test_plural.py @@ -19,7 +19,7 @@ class MockContext(unittest.TestCase): plural_categories = ('one', 'other') def get_source(self, path, key): - return self.strings.get(key, None).get_val() + return self.strings.get(key, None).val @unittest.skipUnless(PropertiesParser, 'compare-locales required') diff --git a/tests/migrate/test_replace.py b/tests/migrate/test_replace.py index 9237877a..1157daf4 100644 --- a/tests/migrate/test_replace.py +++ b/tests/migrate/test_replace.py @@ -16,7 +16,7 @@ class MockContext(unittest.TestCase): def get_source(self, path, key): - return self.strings.get(key, None).get_val() + return self.strings.get(key, None).val @unittest.skipUnless(PropertiesParser, 'compare-locales required')