summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJoe Gordon <joe.gordon0@gmail.com>2015-03-27 11:49:57 -0400
committerJoe Gordon <joe.gordon0@gmail.com>2015-03-27 13:15:44 -0400
commit4f10e45db7bf0eb11ab40cf52398e3038b1cf1b5 (patch)
treed52f91b0ca8375bfe019ea544f82ff381537aa87 /tools
parentf7d582eaa0dbc6e3725006208dd1b4bbf51a950f (diff)
downloadtempest-4f10e45db7bf0eb11ab40cf52398e3038b1cf1b5.tar.gz
Clarify how to resolve a uuid collision
Previously 'tox -epep8' just says run 'tox -v -euuidgen' but without manually removing the duplicate uuid it fails to fix things and says run 'tox -v -euuidgen' again. Change-Id: I1948c2d038d89af8dcfe69d01dcc49d024ae3210
Diffstat (limited to 'tools')
-rwxr-xr-xtools/check_uuid.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/check_uuid.py b/tools/check_uuid.py
index 34effe4c7..e21c3d8ae 100755
--- a/tools/check_uuid.py
+++ b/tools/check_uuid.py
@@ -275,7 +275,7 @@ class TestChecker(object):
if not test_uuid:
return
if test_uuid in uuids:
- error_str = "%s:%s\n uuid %s collision: %s<->%s\n%s:%s\n" % (
+ error_str = "%s:%s\n uuid %s collision: %s<->%s\n%s:%s" % (
tests[module_name]['source_path'],
tests[module_name]['tests'][test_name].lineno,
test_uuid,
@@ -285,6 +285,8 @@ class TestChecker(object):
uuids[test_uuid]['test_node'].lineno,
)
print(error_str)
+ print("cannot automatically resolve the collision, please "
+ "manually remove the duplicate value on the new test.")
return True
else:
uuids[test_uuid] = {