Merge pull request #19 from Pike/compare-locales-bug-1382622

Bug 1382622 -Fix migrations after update to compare-locales

Author: stasm

.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:

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')

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')

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,

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')

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')

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