incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [21/50] git commit: [#6534] ticket:442 fixed failed tests after changes
Date Wed, 09 Oct 2013 12:48:37 GMT
[#6534] ticket:442 fixed failed tests after changes


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

Branch: refs/heads/cj/6422
Commit: 1506e8ad7b072769b400f8fb87e0871395a261de
Parents: e6878f1
Author: coldmind <sokandpal@yandex.ru>
Authored: Mon Sep 23 23:45:07 2013 +0300
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Oct 4 14:21:23 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/github/tests/test_wiki.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/1506e8ad/ForgeImporters/forgeimporters/github/tests/test_wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
index 80a4d72..e280e4e 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
@@ -83,6 +83,7 @@ class TestGitHubWikiImporter(TestCase):
 
     @patch('forgeimporters.github.wiki.WM.Page.upsert')
     @patch('forgeimporters.github.wiki.h.render_any_markup')
+    @patch('forgeimporters.github.wiki.convert_markup')
     def test_without_history(self, render, upsert):
         upsert.text = Mock()
         importer = GitHubWikiImporter()
@@ -126,6 +127,7 @@ class TestGitHubWikiImporter(TestCase):
 
     @patch('forgeimporters.github.wiki.WM.Page.upsert')
     @patch('forgeimporters.github.wiki.h.render_any_markup')
+    @patch('forgeimporters.github.wiki.convert_markup')
     def test_with_history(self, render, upsert):
         self.commit2.stats.files = {"Home.md": self.blob1}
         self.commit2.tree = {"Home.md": self.blob1}
@@ -238,7 +240,7 @@ Our website is <http://sf.net>.
 
 [External link](https://github.com/a/b/issues/1)\n\n'''
 
-        assert_equal(f(source, 'test.md'), result)
+        assert_equal(f(source, 'test.md', None), result)
 
     @without_module('html2text')
     def test_convert_markup_without_html2text(self):
@@ -266,7 +268,7 @@ Our website is [[http://sf.net]].
 <p><a class="" href="/p/test/wiki/Page" rel="nofollow">External link to the wiki
page</a></p>
 <p><a class="" href="https://github.com/a/b/issues/1" rel="nofollow">External
link</a></p></div>'''
 
-        assert_equal(f(source, 'test.md'), result)
+        assert_equal(f(source, 'test.md', None), result)
 
     def test_rewrite_links(self):
         f = GitHubWikiImporter().rewrite_links
@@ -284,6 +286,8 @@ Our website is [[http://sf.net]].
                      u'<a href="/p/test/wiki/Test Page">Test <b>Page</b></a>')
 
 
+
+
 class TestGitHubWikiImportController(TestController, TestCase):
 
     url = '/p/%s/admin/ext/import/github-wiki/' % test_project_with_wiki


Mime
View raw message