incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [10/50] git commit: [#5076] Fixed missed test case and bad imports
Date Sun, 04 Nov 2012 19:53:13 GMT
[#5076] Fixed missed test case and bad imports

Signed-off-by: Cory Johns <johnsca@geek.net>


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

Branch: refs/heads/cj/4691
Commit: d7602b30bbe2f55097f1e885118cf44afa031ac3
Parents: f0a6bdb
Author: Cory Johns <johnsca@geek.net>
Authored: Tue Oct 30 21:48:04 2012 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Tue Oct 30 21:48:04 2012 +0000

----------------------------------------------------------------------
 ForgeGit/forgegit/model/git_repo.py   |    2 +-
 ForgeHg/forgehg/model/hg.py           |    2 +-
 ForgeSVN/forgesvn/model/svn.py        |    5 +----
 ForgeSVN/forgesvn/tests/test_tasks.py |    2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d7602b30/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index cd4728b..4624600 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -10,7 +10,7 @@ from glob import glob
 import tg
 import git
 import gitdb
-from pylons import g
+from pylons import app_globals as g
 from pymongo.errors import DuplicateKeyError
 
 from ming.base import Object

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d7602b30/ForgeHg/forgehg/model/hg.py
----------------------------------------------------------------------
diff --git a/ForgeHg/forgehg/model/hg.py b/ForgeHg/forgehg/model/hg.py
index 22c5bae..0212b4d 100644
--- a/ForgeHg/forgehg/model/hg.py
+++ b/ForgeHg/forgehg/model/hg.py
@@ -8,7 +8,7 @@ from cStringIO import StringIO
 from ConfigParser import ConfigParser
 
 import tg
-from pylons import g
+from pylons import app_globals as g
 os.environ['HGRCPATH'] = '' # disable loading .hgrc
 from mercurial import ui, hg
 from pymongo.errors import DuplicateKeyError

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d7602b30/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 8ce62ec..e8173d8 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -13,11 +13,8 @@ from glob import glob
 
 import tg
 import pysvn
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
 from pymongo.errors import DuplicateKeyError
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
 
 from ming.base import Object
 from ming.orm import Mapper, FieldProperty, session

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d7602b30/ForgeSVN/forgesvn/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/test_tasks.py b/ForgeSVN/forgesvn/tests/test_tasks.py
index 1a6a5f6..c3173a4 100644
--- a/ForgeSVN/forgesvn/tests/test_tasks.py
+++ b/ForgeSVN/forgesvn/tests/test_tasks.py
@@ -46,7 +46,7 @@ class TestRepoTasks(unittest.TestCase):
         with mock.patch.object(c.app.repo, 'init_as_clone') as f:
             repo_tasks.clone('foo', 'bar', 'baz')
             M.main_orm_session.flush()
-            f.assert_called_with('foo', 'bar', 'baz', False)
+            f.assert_called_with('foo', 'bar', 'baz')
             assert ns + 1 == M.Notification.query.find().count()
 
     def test_refresh(self):


Mime
View raw message