Skip to content

Commit

Permalink
Clarify how to resolve a uuid collision
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jogo committed Mar 27, 2015
1 parent f7d582e commit 4f10e45
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tools/check_uuid.py
Expand Up @@ -275,7 +275,7 @@ def report(module_name, test_name, tests):
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,
Expand All @@ -285,6 +285,8 @@ def report(module_name, test_name, tests):
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] = {
Expand Down

0 comments on commit 4f10e45

Please sign in to comment.