use warnings instead of a new dictionary

test/test_option_validator.py

@@ -1,9 +1,11 @@
 import autopath
+import warnings
 from py.test import raises
 
 from tiramisu.config import Config
 from tiramisu.option import StrOption, OptionDescription
 from tiramisu.setting import groups
+from tiramisu.error import ValueWarning
 
 
 def return_true(value, param=None):
@@ -76,24 +78,36 @@ def test_validator_warning():
     root = OptionDescription('root', '', [opt1, opt2, opt3])
     cfg = Config(root)
     assert cfg.opt1 == 'val'
-    cfg.opt1 = 'val'
-    assert cfg.cfgimpl_get_values().has_warning() is False
-    cfg.opt2 = 'val'
-    assert cfg.cfgimpl_get_values().has_warning() is True
-    assert cfg.cfgimpl_get_values().get_warnings() == {opt2: 'invalid value val for option opt2: error'}
-    assert cfg.cfgimpl_get_values().has_warning() is False
-    cfg.opt3.append('val')
-    assert cfg.cfgimpl_get_values().has_warning() is False
-    cfg.opt3.append('val1')
-    assert cfg.cfgimpl_get_values().has_warning() is True
-    assert cfg.cfgimpl_get_values().get_warnings() == {opt3: 'invalid value val1 for option opt3: error'}
-    assert cfg.cfgimpl_get_values().has_warning() is False
+    warnings.simplefilter("always", ValueWarning)
+    with warnings.catch_warnings(record=True) as w:
+        cfg.opt1 = 'val'
+    assert w == []
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.opt2 = 'val'
+    assert len(w) == 1
+    assert w[0].message.opt == opt2
+    assert str(w[0].message) == 'invalid value val for option opt2: error'
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.opt3.append('val')
+    assert w == []
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.opt3.append('val1')
+    assert len(w) == 1
+    assert w[0].message.opt == opt3
+    assert str(w[0].message) == 'invalid value val1 for option opt3: error'
     raises(ValueError, "cfg.opt2 = 1")
-    cfg.opt2 = 'val'
-    cfg.opt3.append('val')
-    assert cfg.cfgimpl_get_values().has_warning() is True
-    assert cfg.cfgimpl_get_values().get_warnings() == {opt2: 'invalid value val for option opt2: error', opt3: 'invalid value val1 for option opt3: error'}
-    assert cfg.cfgimpl_get_values().has_warning() is False
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.opt2 = 'val'
+        cfg.opt3.append('val')
+    assert len(w) == 2
+    assert w[0].message.opt == opt2
+    assert str(w[0].message) == 'invalid value val for option opt2: error'
+    assert w[1].message.opt == opt3
+    assert str(w[1].message) == 'invalid value val1 for option opt3: error'
 
 
 def test_validator_warning_master_slave():
@@ -104,18 +118,38 @@ def test_validator_warning_master_slave():
     assert interface1.impl_get_group_type() == groups.master
     root = OptionDescription('root', '', [interface1])
     cfg = Config(root)
-    cfg.ip_admin_eth0.ip_admin_eth0.append(None)
-    assert cfg.cfgimpl_get_values().has_warning() is False
-    cfg.ip_admin_eth0.netmask_admin_eth0 = ['val1']
-    assert cfg.ip_admin_eth0.netmask_admin_eth0 == ['val1']
-    assert cfg.cfgimpl_get_values().has_warning() is True
-    assert cfg.cfgimpl_get_values().get_warnings() == {netmask_admin_eth0: 'invalid value val1 for option netmask_admin_eth0: error'}
-    cfg.ip_admin_eth0.ip_admin_eth0 = ['val']
-    assert cfg.ip_admin_eth0.ip_admin_eth0 == ['val']
-    assert cfg.cfgimpl_get_values().get_warnings() == {ip_admin_eth0: 'invalid value val for option ip_admin_eth0: error'}
-    cfg.ip_admin_eth0.ip_admin_eth0 = ['val', 'val1', 'val1']
-    assert cfg.cfgimpl_get_values().get_warnings() == {ip_admin_eth0: 'invalid value val for option ip_admin_eth0: error'}
-    cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val', 'val1']
-    assert cfg.cfgimpl_get_values().get_warnings() == {ip_admin_eth0: 'invalid value val for option ip_admin_eth0: error'}
-    cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val1', 'val']
-    assert cfg.cfgimpl_get_values().get_warnings() == {ip_admin_eth0: 'invalid value val for option ip_admin_eth0: error'}
+    warnings.simplefilter("always", ValueWarning)
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.ip_admin_eth0.append(None)
+    assert w == []
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.netmask_admin_eth0 = ['val1']
+    assert len(w) == 1
+    assert w[0].message.opt == netmask_admin_eth0
+    assert str(w[0].message) == 'invalid value val1 for option netmask_admin_eth0: error'
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.ip_admin_eth0 = ['val']
+    assert len(w) == 1
+    assert w[0].message.opt == ip_admin_eth0
+    assert str(w[0].message) == 'invalid value val for option ip_admin_eth0: error'
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.ip_admin_eth0 = ['val', 'val1', 'val1']
+    assert len(w) == 1
+    assert w[0].message.opt == ip_admin_eth0
+    assert str(w[0].message) == 'invalid value val for option ip_admin_eth0: error'
+    #
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val', 'val1']
+    assert len(w) == 1
+    assert w[0].message.opt == ip_admin_eth0
+    assert str(w[0].message) == 'invalid value val for option ip_admin_eth0: error'
+    #
+    warnings.resetwarnings()
+    with warnings.catch_warnings(record=True) as w:
+        cfg.ip_admin_eth0.ip_admin_eth0 = ['val1', 'val1', 'val']
+    assert len(w) == 1
+    assert w[0].message.opt == ip_admin_eth0
+    assert str(w[0].message) == 'invalid value val for option ip_admin_eth0: error'