github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve config.py test coverage

Browse Source
This commit is contained in:
Mike Fährmann
2019-11-25 17:19:14 +01:00
parent f5604492c3
commit b5c964332b
2 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/config.py
View File

@@ -81,7 +81,7 @@ def get(path, key, default=None, *, conf=_config):
for p in path: for p in path:
conf = conf[p] conf = conf[p]
return conf[key] return conf[key]
except KeyError: except Exception:
return default return default
@@ -94,7 +94,7 @@ def interpolate(path, key, default=None, *, conf=_config):
conf = conf[p] conf = conf[p]
if key in conf: if key in conf:
default = conf[key] default = conf[key]
except KeyError: except Exception:
pass pass
return default return default
@@ -125,7 +125,7 @@ def unset(path, key, *, conf=_config):
for p in path: for p in path:
conf = conf[p] conf = conf[p]
del conf[key] del conf[key]
except KeyError: except Exception:
pass pass

74
test/test_config.py
View File

@@ -16,49 +16,80 @@ import tempfile
class TestConfig(unittest.TestCase): class TestConfig(unittest.TestCase):
def setUp(self): def setUp(self):
config.set((), "a", "1") config.set(() , "a", 1)
config.set((), "b", { config.set(("b",) , "a", 2)
"a": 2, config.set(("b", "b"), "a", 3)
"c": "text", config.set(("b",) , "c", "text")
}) config.set(("b", "b"), "c", [8, 9])
def tearDown(self): def tearDown(self):
config.clear() config.clear()
def test_get(self): def test_get(self):
self.assertEqual(config.get(() , "a") , "1") self.assertEqual(config.get(() , "a") , 1)
self.assertEqual(config.get(("b",) , "c") , "text") self.assertEqual(config.get(("b",) , "a") , 2)
self.assertEqual(config.get(() , "d") , None) self.assertEqual(config.get(("b", "b"), "a") , 3)
self.assertEqual(config.get(("e", "f"), "g", 123), 123)
self.assertEqual(config.get(() , "c") , None)
self.assertEqual(config.get(("b",) , "c") , "text")
self.assertEqual(config.get(("b", "b"), "c") , [8, 9])
self.assertEqual(config.get(("a",) , "g") , None)
self.assertEqual(config.get(("a", "a"), "g") , None)
self.assertEqual(config.get(("e", "f"), "g") , None)
self.assertEqual(config.get(("e", "f"), "g", 4), 4)
def test_interpolate(self): def test_interpolate(self):
self.assertEqual(config.interpolate(() , "a") , "1") self.assertEqual(config.interpolate(() , "a"), 1)
self.assertEqual(config.interpolate(("b",), "a") , "1") self.assertEqual(config.interpolate(("b",) , "a"), 1)
self.assertEqual(config.interpolate(("b",), "c", "2"), "text") self.assertEqual(config.interpolate(("b", "b"), "a"), 1)
self.assertEqual(config.interpolate(("b",), "d", "2"), "2")
config.set((), "d", 123) self.assertEqual(config.interpolate(() , "c"), None)
self.assertEqual(config.interpolate(("b",), "d", "2"), 123) self.assertEqual(config.interpolate(("b",) , "c"), "text")
self.assertEqual(config.interpolate(("d",), "d", "2"), 123) self.assertEqual(config.interpolate(("b", "b"), "c"), [8, 9])
self.assertEqual(config.interpolate(("a",) , "g") , None)
self.assertEqual(config.interpolate(("a", "a"), "g") , None)
self.assertEqual(config.interpolate(("e", "f"), "g") , None)
self.assertEqual(config.interpolate(("e", "f"), "g", 4), 4)
self.assertEqual(config.interpolate(("b",), "d", 1) , 1)
self.assertEqual(config.interpolate(("d",), "d", 1) , 1)
config.set(() , "d", 2)
self.assertEqual(config.interpolate(("b",), "d", 1) , 2)
self.assertEqual(config.interpolate(("d",), "d", 1) , 2)
config.set(("b",), "d", 3)
self.assertEqual(config.interpolate(("b",), "d", 1) , 2)
self.assertEqual(config.interpolate(("d",), "d", 1) , 2)
def test_set(self): def test_set(self):
config.set(() , "c", [1, 2, 3])
config.set(("b",) , "c", [1, 2, 3]) config.set(("b",) , "c", [1, 2, 3])
config.set(("e", "f"), "g", value=234) config.set(("e", "f"), "g", value=234)
self.assertEqual(config.get(() , "c"), [1, 2, 3])
self.assertEqual(config.get(("b",) , "c"), [1, 2, 3]) self.assertEqual(config.get(("b",) , "c"), [1, 2, 3])
self.assertEqual(config.get(("e", "f"), "g"), 234) self.assertEqual(config.get(("e", "f"), "g"), 234)
def test_setdefault(self): def test_setdefault(self):
config.setdefault(() , "c", [1, 2, 3])
config.setdefault(("b",) , "c", [1, 2, 3]) config.setdefault(("b",) , "c", [1, 2, 3])
config.setdefault(("e", "f"), "g", value=234) config.setdefault(("e", "f"), "g", value=234)
self.assertEqual(config.get(() , "c"), [1, 2, 3])
self.assertEqual(config.get(("b",) , "c"), "text") self.assertEqual(config.get(("b",) , "c"), "text")
self.assertEqual(config.get(("e", "f"), "g"), 234) self.assertEqual(config.get(("e", "f"), "g"), 234)
def test_unset(self): def test_unset(self):
config.unset(() , "a") config.unset(() , "a")
config.unset(("b",), "c") config.unset(("b",), "c")
config.unset(("a",), "d")
config.unset(("b",), "d")
config.unset(("c",), "d") config.unset(("c",), "d")
self.assertEqual(config.get(() , "a"), None) self.assertEqual(config.get(() , "a"), None)
self.assertEqual(config.get(("b",), "a"), 2) self.assertEqual(config.get(("b",), "a"), 2)
self.assertEqual(config.get(("b",), "c"), None) self.assertEqual(config.get(("b",), "c"), None)
self.assertEqual(config.get(("a",), "d"), None)
self.assertEqual(config.get(("b",), "d"), None)
self.assertEqual(config.get(("c",), "d"), None)
def test_apply(self): def test_apply(self):
options = ( options = (
@@ -80,26 +111,27 @@ class TestConfig(unittest.TestCase):
with tempfile.TemporaryDirectory() as base: with tempfile.TemporaryDirectory() as base:
path1 = os.path.join(base, "cfg1") path1 = os.path.join(base, "cfg1")
with open(path1, "w") as file: with open(path1, "w") as file:
file.write('{"a": "1", "b": {"a": 2, "c": "text"}}') file.write('{"a": 1, "b": {"a": 2, "c": "text"}}')
path2 = os.path.join(base, "cfg2") path2 = os.path.join(base, "cfg2")
with open(path2, "w") as file: with open(path2, "w") as file:
file.write('{"a": "7", "b": {"a": 8, "e": "foo"}}') file.write('{"a": 7, "b": {"a": 8, "e": "foo"}}')
config.clear()
config.load((path1,)) config.load((path1,))
self.assertEqual(config.get(() , "a"), "1") self.assertEqual(config.get(() , "a"), 1)
self.assertEqual(config.get(("b",), "a"), 2) self.assertEqual(config.get(("b",), "a"), 2)
self.assertEqual(config.get(("b",), "c"), "text") self.assertEqual(config.get(("b",), "c"), "text")
config.load((path2,)) config.load((path2,))
self.assertEqual(config.get(() , "a"), "7") self.assertEqual(config.get(() , "a"), 7)
self.assertEqual(config.get(("b",), "a"), 8) self.assertEqual(config.get(("b",), "a"), 8)
self.assertEqual(config.get(("b",), "c"), "text") self.assertEqual(config.get(("b",), "c"), "text")
self.assertEqual(config.get(("b",), "e"), "foo") self.assertEqual(config.get(("b",), "e"), "foo")
config.clear() config.clear()
config.load((path1, path2)) config.load((path1, path2))
self.assertEqual(config.get(() , "a"), "7") self.assertEqual(config.get(() , "a"), 7)
self.assertEqual(config.get(("b",), "a"), 8) self.assertEqual(config.get(("b",), "a"), 8)
self.assertEqual(config.get(("b",), "c"), "text") self.assertEqual(config.get(("b",), "c"), "text")
self.assertEqual(config.get(("b",), "e"), "foo") self.assertEqual(config.get(("b",), "e"), "foo")