incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [18/28] git commit: Fix some tests and bump GC wiki import version
Date Thu, 23 Jan 2014 17:30:00 GMT
Fix some tests and bump GC wiki import version

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>


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

Branch: refs/heads/cj/4257
Commit: 6c2cb1a6c269307faa9770f1da1562301254f9ee
Parents: a2bc2dd
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Jan 22 22:39:18 2014 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Jan 22 22:39:18 2014 +0000

----------------------------------------------------------------------
 Allura/allura/tests/test_helpers.py   | 2 +-
 Allura/allura/tests/test_mail_util.py | 4 ++--
 requirements-sf.txt                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c2cb1a6/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 48f4309..d89df75 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -273,7 +273,7 @@ def test_log_if_changed():
 
 def test_get_tool_package():
     assert h.get_tool_package('tickets') == 'forgetracker'
-    assert h.get_tool_package('Wiki') == 'forgewiki'
+    assert h.get_tool_package('Tickets') == 'forgetracker'
     assert h.get_tool_package('wrong_tool') == ''
 
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c2cb1a6/Allura/allura/tests/test_mail_util.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_mail_util.py b/Allura/allura/tests/test_mail_util.py
index 6b1657d..64a1c92 100644
--- a/Allura/allura/tests/test_mail_util.py
+++ b/Allura/allura/tests/test_mail_util.py
@@ -27,7 +27,7 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib.utils import ConfigProxy
-
+from allura.app import Application
 from allura.lib.mail_util import (
     parse_address,
     parse_message,
@@ -74,7 +74,7 @@ class TestReactor(unittest.TestCase):
             'foo@wiki.test.p' + config.common_suffix)
         assert_equal(topic, 'foo')
         assert_equal(project.shortname, 'test')
-        assert_equal(app.__class__.__name__, 'ForgeWikiApp')
+        assert_true(isinstance(app, Application))
 
     def test_unicode_simple_message(self):
         charset = 'utf-8'

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c2cb1a6/requirements-sf.txt
----------------------------------------------------------------------
diff --git a/requirements-sf.txt b/requirements-sf.txt
index 8dd935a..1db3bd4 100644
--- a/requirements-sf.txt
+++ b/requirements-sf.txt
@@ -6,7 +6,7 @@ kombu==1.0.4
 coverage==3.5a1-20110413
 ForgeHg==0.1.21
 ForgePastebin==0.3.0
-GoogleCodeWikiImporter==0.4.7
+GoogleCodeWikiImporter==0.4.8
 mechanize==0.2.4
 mercurial==1.4.3
 MySQL-python==1.2.3c1


Mime
View raw message