comparison tests/test.py @ 251:2a8dcab2de8c

Do not implicitely convert a configuration value to text if the value is the result of just a variable expansion. This is technically a breaking change. But no known client code uses the old behaviour.
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 07 Jul 2020 22:21:27 +0200
parents b2c75efad9e4
children af371f9c016d
comparison
equal deleted inserted replaced
250:ff964825a75a 251:2a8dcab2de8c
389 configmix.set_assoc("*", "-*-ignore-*-") 389 configmix.set_assoc("*", "-*-ignore-*-")
390 390
391 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"), 391 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"),
392 os.path.join(TESTDATADIR, "conf30.conf")) 392 os.path.join(TESTDATADIR, "conf30.conf"))
393 self.assertRaises(KeyError, cfg.getvar_s, "key-new") 393 self.assertRaises(KeyError, cfg.getvar_s, "key-new")
394 self.assertRaises(KeyError, cfg.getvar_s, "key1") 394 self.assertRaises(KeyError, cfg.getvar_s, "key1")
395 395
396 def test03_only_style_corrrect_style(self): 396 def test03_only_style_corrrect_style(self):
397 configmix.clear_assoc() 397 configmix.clear_assoc()
398 configmix.set_assoc("*.conf", configmix.get_default_assoc("*.yml")) 398 configmix.set_assoc("*.conf", configmix.get_default_assoc("*.yml"))
399 cfg = configmix.load(os.path.join(TESTDATADIR, "conf30.conf")) 399 cfg = configmix.load(os.path.join(TESTDATADIR, "conf30.conf"))
429 return configmix.load(os.path.join(TESTDATADIR, "unknown-mode.conf")) 429 return configmix.load(os.path.join(TESTDATADIR, "unknown-mode.conf"))
430 430
431 self.assertRaises(KeyError, _ld) 431 self.assertRaises(KeyError, _ld)
432 432
433 433
434 class T05SubstituteExpand(unittest.TestCase):
435
436 def setUp(self):
437 self._reset()
438
439 def tearDown(self):
440 self._reset()
441
442 def _reset(self):
443 configmix.clear_assoc()
444 for pat, fmode in configmix.DEFAULT_ASSOC:
445 configmix.set_assoc(pat, fmode)
446
447 def test01_expand_int_ini(self):
448 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"))
449 self.assertEqual(2, cfg.getvar_s("key100"))
450
451 def test02_expand_int_indirect_ini(self):
452 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"))
453 self.assertEqual(2, cfg.getvar_s("key102"))
454
455 def test03_expand_int2str_ini(self):
456 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"))
457 self.assertEqual("the 2 value", cfg.getvar_s("key101"))
458
459 def test04_expand_intint2str_ini(self):
460 cfg = configmix.load(os.path.join(TESTDATADIR, "conf1.ini"))
461 self.assertEqual("22", cfg.getvar_s("key103"))
462
463
434 if __name__ == "__main__": 464 if __name__ == "__main__":
435 unittest.main() 465 unittest.main()