From 0a83a9261f8dbeaa1f041eebe783a4f72b03aa8e Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Mon, 30 Sep 2013 22:56:08 +0200
Subject: [PATCH] update invalid's message and display all informations when
 raises

---
 test/test_option_validator.py | 18 +++++++++---------
 tiramisu/option.py            |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/test_option_validator.py b/test/test_option_validator.py
index 001f9f7..9a39816 100644
--- a/test/test_option_validator.py
+++ b/test/test_option_validator.py
@@ -87,7 +87,7 @@ def test_validator_warning():
         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'
+    assert str(w[0].message) == 'invalid value for option opt2: error'
     #
     with warnings.catch_warnings(record=True) as w:
         cfg.opt3.append('val')
@@ -97,7 +97,7 @@ def test_validator_warning():
         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'
+    assert str(w[0].message) == 'invalid value for option opt3: error'
     raises(ValueError, "cfg.opt2 = 1")
     #
     with warnings.catch_warnings(record=True) as w:
@@ -105,9 +105,9 @@ def test_validator_warning():
         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 str(w[0].message) == 'invalid value for option opt2: error'
     assert w[1].message.opt == opt3
-    assert str(w[1].message) == 'invalid value val1 for option opt3: error'
+    assert str(w[1].message) == 'invalid value for option opt3: error'
 
 
 def test_validator_warning_master_slave():
@@ -127,29 +127,29 @@ def test_validator_warning_master_slave():
         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'
+    assert str(w[0].message) == 'invalid value 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'
+    assert str(w[0].message) == 'invalid value 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'
+    assert str(w[0].message) == 'invalid value 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'
+    assert str(w[0].message) == 'invalid value 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'
+    assert str(w[0].message) == 'invalid value for option ip_admin_eth0: error'
diff --git a/tiramisu/option.py b/tiramisu/option.py
index 125f27f..7dfe3d5 100644
--- a/tiramisu/option.py
+++ b/tiramisu/option.py
@@ -925,11 +925,11 @@ class NetmaskOption(Option):
                 except ValueError:
                     if not make_net:
                         msg = _("invalid network {0} ({1}) "
-                                "with netmask {2} ({3}),"
+                                "with netmask {2},"
                                 " this network is an IP")
                 else:
                     if make_net:
-                        msg = _("invalid IP {0} ({1}) with netmask {2} ({3}),"
+                        msg = _("invalid IP {0} ({1}) with netmask {2},"
                                 " this IP is a network")
 
         except ValueError: