Updated config tests to match change in error message

Author: geky

tools/config.py

@@ -149,15 +149,15 @@ def __init__(self, name, additions=set(), removals=set(), strict=False):
     def remove_cumulative_overrides(self, overrides):
         for override in overrides:
             if override in self.additions:
-                raise ConfigException("Configuration conflict. The %s %s both added and removed." % (self.name, override))
+                raise ConfigException("Configuration conflict. The %s %s both added and removed." % (self.name[:-1], override))
 
         self.removals |= set(overrides)
 
     # Remove attr from the cumulative overrides
     def add_cumulative_overrides(self, overrides):
         for override in overrides:
             if (override in self.removals or (self.strict and override not in self.additions)):
-                raise ConfigException("Configuration conflict. The %s %s both added and removed." % (self.name, override))
+                raise ConfigException("Configuration conflict. The %s %s both added and removed." % (self.name[:-1], override))
 
         self.additions |= set(overrides)
 

tools/test/config_test/test23/test_data.py

@@ -3,6 +3,6 @@
 expected_results = {
     "K64F": {
         "desc": "test feature collisions",
-        "exception_msg": "Configuration conflict. Feature IPV4 both added and removed." 
+        "exception_msg": "Configuration conflict. The feature IPV4 both added and removed." 
     }
 }

tools/test/config_test/test25/test_data.py

@@ -3,6 +3,6 @@
 expected_results = {
     "K64F": {
         "desc": "test recursive feature collisions",
-        "exception_msg": "Configuration conflict. Feature UVISOR both added and removed." 
+        "exception_msg": "Configuration conflict. The feature UVISOR both added and removed." 
     }
 }