From de4fb9302aab979ac3dbb8b2e62c9f9255f8f16f Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Fri, 6 Jan 2012 17:49:57 +0000 Subject: Bug #912858: test_authors_up_to_date does not deal with capitalized names properly ensure we are not fooled by capitalized names, by turning emails and names into lower cases before the matching. Change-Id: Idbb8535174c0f1451ad6fd0628f35508f0f1e466 --- nova/tests/test_misc.py | 5 +++-- nova/utils.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py index 6bee4022f..0a673e68e 100644 --- a/nova/tests/test_misc.py +++ b/nova/tests/test_misc.py @@ -47,7 +47,8 @@ class ProjectTestCase(test.TestCase): missing = set() contributors = set() mailmap = parse_mailmap(os.path.join(topdir, '.mailmap')) - authors_file = open(os.path.join(topdir, 'Authors'), 'r').read() + authors_file = open(os.path.join(topdir, + 'Authors'), 'r').read().lower() if os.path.exists(os.path.join(topdir, '.git')): for email in commands.getoutput('git log --format=%ae').split(): @@ -55,7 +56,7 @@ class ProjectTestCase(test.TestCase): continue if "jenkins" in email and "openstack.org" in email: continue - email = '<' + email + '>' + email = '<' + email.lower() + '>' contributors.add(str_dict_replace(email, mailmap)) else: return diff --git a/nova/utils.py b/nova/utils.py index 3d2f901a8..c55bd6322 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -544,7 +544,7 @@ def parse_mailmap(mailmap='.mailmap'): l = l.strip() if not l.startswith('#') and ' ' in l: canonical_email, alias = l.split(' ') - mapping[alias] = canonical_email + mapping[alias.lower()] = canonical_email.lower() return mapping -- cgit