You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/01/28 16:32:46 UTC
allura git commit: Fix test
Repository: allura
Updated Branches:
refs/heads/master 481be58b2 -> 7336d1475
Fix test
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7336d147
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7336d147
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7336d147
Branch: refs/heads/master
Commit: 7336d1475bf30250e9e60c68ed82a13772cbf231
Parents: 481be58
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Jan 28 10:32:37 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Jan 28 10:32:37 2016 -0500
----------------------------------------------------------------------
ForgeGit/forgegit/tests/model/test_repository.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7336d147/ForgeGit/forgegit/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index 5ec806a..7c15bae 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -642,7 +642,7 @@ class TestGitRepo(unittest.TestCase, RepoImplTestBase):
assert_equal(
tmp_repo.git.config.call_args_list,
[mock.call('user.name', 'Test Admin'),
- mock.call('user.email', '')])
+ mock.call('user.email', 'allura@localhost')])
msg = u'Merge downstream-repo-url branch source-branch into target-branch'
msg += u'\n\nhttp://localhost/merge-request/1/'
tmp_repo.git.merge.assert_called_once_with('cid', '-m', msg)