incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/2] git commit: [#5229] better ForgeActivity test handling
Date Mon, 05 Nov 2012 16:32:57 GMT
[#5229] better ForgeActivity test handling


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

Branch: refs/heads/db/5229
Commit: f5c8e378fc0256191311f4ecce8f4a9765e3adf2
Parents: e8fad3c
Author: Dave Brondsema <dbrondsema@geek.net>
Authored: Mon Nov 5 16:26:58 2012 +0000
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Mon Nov 5 16:30:35 2012 +0000

----------------------------------------------------------------------
 ForgeActivity/forgeactivity/main.py                |    1 +
 .../forgeactivity/tests/functional/test_root.py    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f5c8e378/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 9452d21..4255788 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -98,6 +98,7 @@ class ForgeActivityController(BaseController):
             else:
                 g.director.disconnect(c.user, followee)
         except Exception as e:
+            log.exception('Unexpected error following user')
             return dict(
                 success=False,
                 message='Unexpected error: %s' % e)

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f5c8e378/ForgeActivity/forgeactivity/tests/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/tests/__init__.py b/ForgeActivity/forgeactivity/tests/__init__.py
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f5c8e378/ForgeActivity/forgeactivity/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/tests/functional/test_root.py b/ForgeActivity/forgeactivity/tests/functional/test_root.py
index a4a9ede..5e7c72d 100644
--- a/ForgeActivity/forgeactivity/tests/functional/test_root.py
+++ b/ForgeActivity/forgeactivity/tests/functional/test_root.py
@@ -35,7 +35,7 @@ class TestActivityController(TestController):
     @td.with_user_project('test-user-1')
     def test_follow_user(self):
         resp = self.app.get('/u/test-user-1/activity/follow?follow=True')
-        assert 'You are now following Test User 1' in resp
+        assert 'You are now following Test User 1' in resp, resp
 
     @td.with_tool('u/test-admin', 'activity')
     @td.with_user_project('test-admin')


Mime
View raw message