ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated config tests to match change in error message

pull/2215/head
Christopher Haster 2016-07-21 23:44:42 -05:00
parent 9bd7a2fe72
commit a5ea143c77
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/config.py
View File

@ -149,7 +149,7 @@ class ConfigCumulativeOverride:
def remove_cumulative_overrides(self, overrides): def remove_cumulative_overrides(self, overrides):
for override in overrides: for override in overrides:
if override in self.additions: 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) self.removals |= set(overrides)
@ -157,7 +157,7 @@ class ConfigCumulativeOverride:
def add_cumulative_overrides(self, overrides): def add_cumulative_overrides(self, overrides):
for override in overrides: for override in overrides:
if (override in self.removals or (self.strict and override not in self.additions)): 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) self.additions |= set(overrides)

2
tools/test/config_test/test23/test_data.py
View File

@ -3,6 +3,6 @@
expected_results = { expected_results = {
"K64F": { "K64F": {
"desc": "test feature collisions", "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."
} }
} }

2
tools/test/config_test/test25/test_data.py
View File

@ -3,6 +3,6 @@
expected_results = { expected_results = {
"K64F": { "K64F": {
"desc": "test recursive feature collisions", "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."
} }
} }