diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 03:00:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 03:00:35 +0000 |
commit | 3d40ea10f8008776a89176065b023a99b770285d (patch) | |
tree | 77463091251caf2d1511fbf33633d48282c920a7 /pbr/tests/test_setup.py | |
parent | bb8bdf0e767a65959278ceac252491c5db904360 (diff) | |
parent | 80bf39aa796ee6ca64a5d73cb50c83d32f9bda5d (diff) | |
download | pbr-3d40ea10f8008776a89176065b023a99b770285d.tar.gz |
Merge "Fix .mailmap file search location"
Diffstat (limited to 'pbr/tests/test_setup.py')
-rw-r--r-- | pbr/tests/test_setup.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py index 398c503..11f9a04 100644 --- a/pbr/tests/test_setup.py +++ b/pbr/tests/test_setup.py @@ -49,27 +49,26 @@ class MailmapTestCase(tests.BaseTestCase): def setUp(self): super(MailmapTestCase, self).setUp() - self.git_dir = self.useFixture(fixtures.TempDir()).path - self.mailmap = os.path.join(self.git_dir, '.mailmap') + self.root_dir = self.useFixture(fixtures.TempDir()).path + self.mailmap = os.path.join(self.root_dir, '.mailmap') def test_mailmap_with_fullname(self): - print(self.mailmap, self.git_dir) with open(self.mailmap, 'w') as mm_fh: mm_fh.write("Foo Bar <email@foo.com> Foo Bar <email@bar.com>\n") self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - packaging.read_git_mailmap(self.git_dir)) + packaging.read_git_mailmap(self.root_dir)) def test_mailmap_with_firstname(self): with open(self.mailmap, 'w') as mm_fh: mm_fh.write("Foo <email@foo.com> Foo <email@bar.com>\n") self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - packaging.read_git_mailmap(self.git_dir)) + packaging.read_git_mailmap(self.root_dir)) def test_mailmap_with_noname(self): with open(self.mailmap, 'w') as mm_fh: mm_fh.write("<email@foo.com> <email@bar.com>\n") self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, - packaging.read_git_mailmap(self.git_dir)) + packaging.read_git_mailmap(self.root_dir)) class SkipFileWrites(tests.BaseTestCase): @@ -185,9 +184,11 @@ class GitLogsTest(tests.BaseTestCase): git_log_cmd = ("git --git-dir=%s log --format" % self.git_dir) git_co_log_cmd = ("git log --git-dir=%s" % self.git_dir) + git_top_level = "git rev-parse --show-toplevel" cmd_map = { git_log_cmd: author_new, git_co_log_cmd: co_author_by, + git_top_level: self.root_dir, } exist_files = [self.git_dir, |