[14/27] git commit: [#7657] ticket:651 Fix tests failures

[br...@apache.org]

[#7657] ticket:651 Fix tests failures


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

Branch: refs/heads/db/7657
Commit: 420ef9c2b15754a905b73a62066e7f2633a16ad4
Parents: 6bcbdaf
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 16 11:50:51 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Sep 26 16:39:45 2014 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_site_admin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/420ef9c2/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index 5ad00af..aced210 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -354,8 +354,9 @@ class TestUserDetails(TestController):
         assert_in('Adobe project 1', projects)
 
     @patch('allura.model.auth.request')
-    def test_audit_log(self, request):
-        request.url = 'http://host.domain/path/'
+    @patch('allura.lib.helpers.request')
+    def test_audit_log(self, req1, req2):
+        req1.url = req2.url = 'http://host.domain/path/'
         c.user = M.User.by_username('test-user-1')
         h.auditlog_user('test activity user 1')
         h.auditlog_user('test activity user 2', user=M.User.by_username('test-user-2'))
@@ -379,7 +380,7 @@ class TestUserDetails(TestController):
     def test_add_comment(self):
         r = self.app.get('/nf/admin/user/test-user')
         assert_not_in(u'Comment by test-admin: I was hêre!', r)
-        form = r.forms[0]
+        form = r.forms[1]
         assert_equal(form['username'].value, 'test-user')
         form['comment'] = u'I was hêre!'
         r = form.submit()