diff options
| author | David Drysdale <dmd@lurklurk.org> | 2013-09-20 16:52:48 +0100 |
|---|---|---|
| committer | David Drysdale <dmd@lurklurk.org> | 2013-09-20 16:52:48 +0100 |
| commit | 775d1eae81bd01865ec12e969ec015559c23f7b1 (patch) | |
| tree | c9ea6d882814dedcbb10181339681b631746b0af | |
| parent | da4a495f1555241161e1b19ba53011c60ee0f48b (diff) | |
Merge code changes from upstream r608
| -rw-r--r-- | python/tests/examplenumberstest.py | 4 | ||||
| -rw-r--r-- | python/tests/shortnumberinfotest.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/python/tests/examplenumberstest.py b/python/tests/examplenumberstest.py index 819a1cac..8eb5e196 100644 --- a/python/tests/examplenumberstest.py +++ b/python/tests/examplenumberstest.py @@ -157,7 +157,9 @@ class ExampleNumbersTest(unittest.TestCase): else: emergencyNumber = phonenumberutil.parse(exampleNumber, regionCode) if shortnumberinfo.expected_cost(emergencyNumber) != ShortNumberCost.TOLL_FREE: - wrongTypeCounter += 1 + # TODO: Reenable this when a method is available to get the expected cost for a + # particular region. + #wrongTypeCounter += 1 print >> sys.stderr, "Emergency example number not toll free for %s" % regionCode self.assertEqual(0, wrongTypeCounter) diff --git a/python/tests/shortnumberinfotest.py b/python/tests/shortnumberinfotest.py index 971defd7..915e9b16 100644 --- a/python/tests/shortnumberinfotest.py +++ b/python/tests/shortnumberinfotest.py @@ -98,9 +98,9 @@ class ShortNumberInfoTest(TestMetadataTestCase): def testGetExampleShortNumberForCost(self): self.assertEqual("3010", shortnumberinfo._example_short_number_for_cost("FR", ShortNumberCost.TOLL_FREE)) - self.assertEqual("118777", + self.assertEqual("1023", shortnumberinfo._example_short_number_for_cost("FR", ShortNumberCost.STANDARD_RATE)) - self.assertEqual("3200", + self.assertEqual("42000", shortnumberinfo._example_short_number_for_cost("FR", ShortNumberCost.PREMIUM_RATE)) self.assertEqual("", shortnumberinfo._example_short_number_for_cost("FR", ShortNumberCost.UNKNOWN_COST)) |