You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/09/22 12:28:11 UTC
[30/31] git commit: Revert "[#7657] ticket:651 Comment out tests that
cause other tests freezing"
Revert "[#7657] ticket:651 Comment out tests that cause other tests freezing"
This reverts commit 505ff3b183ee48dc5b71b0ce9ef0777a3a0672c9.
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2e490dc5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2e490dc5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2e490dc5
Branch: refs/heads/je/42cc_7657b
Commit: 2e490dc5f9c76ffef8b69bd33a29542896abad03
Parents: b6a27f2
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Sep 22 11:00:18 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Sep 22 11:14:58 2014 +0300
----------------------------------------------------------------------
.../allura/tests/functional/test_site_admin.py | 48 ++++++++++----------
1 file changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2e490dc5/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 a388170..a64dfa9 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -390,30 +390,30 @@ class TestUserDetails(TestController):
r = self.app.get('/nf/admin/user/test-user')
assert_in(u'Comment by test-admin: I was hêre!', r)
- #def test_disable_user(self):
- #assert_equal(M.User.by_username('test-user-3').disabled, False)
- #r = self.app.get('/nf/admin/user/test-user-3')
- #form = r.forms[0]
- #assert_equal(form['username'].value, 'test-user-3')
- #assert_equal(form['status'].value, 'enable')
- #form['status'].value = 'disable'
- #r = form.submit()
- #assert_in(u'User disabled', self.webflash(r))
- #assert_equal(M.User.by_username('test-user-3').disabled, True)
-
- #def test_enable_user(self):
- #user = M.User.by_username('test-user-3')
- #user.disabled = True
- #ThreadLocalORMSession.flush_all()
- #assert_equal(M.User.by_username('test-user-3').disabled, True)
- #r = self.app.get('/nf/admin/user/test-user-3')
- #form = r.forms[0]
- #assert_equal(form['username'].value, 'test-user-3')
- #assert_equal(form['status'].value, 'disable')
- #form['status'].value = 'enable'
- #r = form.submit()
- #assert_in(u'User enabled', self.webflash(r))
- #assert_equal(M.User.by_username('test-user-3').disabled, False)
+ def test_disable_user(self):
+ assert_equal(M.User.by_username('test-user-3').disabled, False)
+ r = self.app.get('/nf/admin/user/test-user-3')
+ form = r.forms[0]
+ assert_equal(form['username'].value, 'test-user-3')
+ assert_equal(form['status'].value, 'enable')
+ form['status'].value = 'disable'
+ r = form.submit()
+ assert_in(u'User disabled', self.webflash(r))
+ assert_equal(M.User.by_username('test-user-3').disabled, True)
+
+ def test_enable_user(self):
+ user = M.User.by_username('test-user-3')
+ user.disabled = True
+ ThreadLocalORMSession.flush_all()
+ assert_equal(M.User.by_username('test-user-3').disabled, True)
+ r = self.app.get('/nf/admin/user/test-user-3')
+ form = r.forms[0]
+ assert_equal(form['username'].value, 'test-user-3')
+ assert_equal(form['status'].value, 'disable')
+ form['status'].value = 'enable'
+ r = form.submit()
+ assert_in(u'User enabled', self.webflash(r))
+ assert_equal(M.User.by_username('test-user-3').disabled, False)
def test_emails(self):
# add test@example.com