summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/tests/test_misc.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index e510e87ad..6bee4022f 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -49,26 +49,7 @@ class ProjectTestCase(test.TestCase):
mailmap = parse_mailmap(os.path.join(topdir, '.mailmap'))
authors_file = open(os.path.join(topdir, 'Authors'), 'r').read()
- if os.path.exists(os.path.join(topdir, '.bzr')):
- import bzrlib.workingtree
- tree = bzrlib.workingtree.WorkingTree.open(topdir)
- tree.lock_read()
- try:
- parents = tree.get_parent_ids()
- g = tree.branch.repository.get_graph()
- for p in parents:
- rev_ids = [r for r, _ in g.iter_ancestry(parents)
- if r != "null:"]
- revs = tree.branch.repository.get_revisions(rev_ids)
- for r in revs:
- for author in r.get_apparent_authors():
- email = author.split(' ')[-1]
- contributors.add(str_dict_replace(email,
- mailmap))
- finally:
- tree.unlock()
-
- elif os.path.exists(os.path.join(topdir, '.git')):
+ if os.path.exists(os.path.join(topdir, '.git')):
for email in commands.getoutput('git log --format=%ae').split():
if not email:
continue