From 02dd2886783cd303cff6890a741152d013bb00ce Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 29 Jun 2020 00:33:22 -0400 Subject: New upstream version 1.14.2. --- test/test_config.py | 28 ++++++++++++++++++++++++++++ test/test_results.py | 3 +-- test/test_text.py | 4 ++++ 3 files changed, 33 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/test_config.py b/test/test_config.py index 4171435..a9cefd4 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -68,6 +68,34 @@ class TestConfig(unittest.TestCase): self.assertEqual(config.interpolate(("b",), "d", 1) , 2) self.assertEqual(config.interpolate(("d",), "d", 1) , 2) + def test_interpolate_common(self): + + def lookup(): + return config.interpolate_common( + ("Z1", "Z2"), ( + ("A1", "A2"), + ("B1",), + ("C1", "C2", "C3"), + ), "KEY", "DEFAULT", + ) + + def test(path, value, expected=None): + config.set(path, "KEY", value) + self.assertEqual(lookup(), expected or value) + + self.assertEqual(lookup(), "DEFAULT") + test(("Z1",), 1) + test(("Z1", "Z2"), 2) + test(("Z1", "Z2", "C1"), 3) + test(("Z1", "Z2", "C1", "C2"), 4) + test(("Z1", "Z2", "C1", "C2", "C3"), 5) + test(("Z1", "Z2", "B1"), 6) + test(("Z1", "Z2", "A1"), 7) + test(("Z1", "Z2", "A1", "A2"), 8) + test(("Z1", "A1", "A2"), 999, 8) + test(("Z1", "Z2", "A1", "A2", "A3"), 999, 8) + test((), 9) + def test_set(self): config.set(() , "c", [1, 2, 3]) config.set(("b",) , "c", [1, 2, 3]) diff --git a/test/test_results.py b/test/test_results.py index 196d859..6a943aa 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -31,10 +31,9 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { + "bobx", "imagevenue", "photobucket", - "seiga", - "twitter", "worldthree", } diff --git a/test/test_text.py b/test/test_text.py index aeb8096..34585d1 100644 --- a/test/test_text.py +++ b/test/test_text.py @@ -406,6 +406,10 @@ class TestText(unittest.TestCase): f("2019-05-07T21:25:02+0900"), datetime.datetime(2019, 5, 7, 12, 25, 2), ) + self.assertEqual( + f("2019-05-07T21:25:02.753+0900", "%Y-%m-%dT%H:%M:%S.%f%z"), + datetime.datetime(2019, 5, 7, 12, 25, 2), + ) self.assertEqual( f("2019-05-07T21:25:02", "%Y-%m-%dT%H:%M:%S", utcoffset=9), datetime.datetime(2019, 5, 7, 12, 25, 2), -- cgit v1.2.3