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 2015/04/15 16:55:05 UTC

[6/8] allura git commit: tests

tests


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8e91db7a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8e91db7a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8e91db7a

Branch: refs/heads/db/7870
Commit: 8e91db7a9ca9f083592822a9fd3d25db5aed48aa
Parents: 445caa6
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Apr 15 10:54:06 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Apr 15 10:54:23 2015 -0400

----------------------------------------------------------------------
 ForgeGit/forgegit/tests/model/test_repository.py        | 1 +
 ForgeTracker/forgetracker/tests/functional/test_root.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/8e91db7a/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 854462c..dbc12b0 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -404,6 +404,7 @@ class TestGitRepo(unittest.TestCase, RepoImplTestBase):
         self.assertEqual(cids[-1], '9a7df788cf800241e3bb5a849c8870f2f8259d98')
 
     def test_ls(self):
+        c.lcid_cache = {}  # else it'll be a mock
         lcd_map = self.repo.commit('HEAD').tree.ls()
         self.assertEqual(lcd_map, [{
             'href': u'README',

http://git-wip-us.apache.org/repos/asf/allura/blob/8e91db7a/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 0e92b1f..5b0d094 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -2318,7 +2318,7 @@ class TestFunctionalController(TrackerTestController):
             return_path, rcpts, body = _client.sendmail.call_args[0]
             body = body.split('\n')
             assert 'Subject: [test:bugs] #1 test <h2> ticket' in body
-            assert '<p><strong> <a class="alink" href="http://localhost/p/test/bugs/1">[bugs:#1]</a> test &lt;h2&gt; ticket</strong></p>' in body
+            assert_in('<p><strong> <a class="alink" href="http://localhost:8080/p/test/bugs/1">[bugs:#1]</a> test &lt;h2&gt; ticket</strong></p>', body)
 
     @patch('forgetracker.search.query_filter_choices')
     def test_multiselect(self, query_filter_choices):