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:27:59 UTC
[18/31] git commit: [#7657] ticket:651 Another attempt to fix tests
freezing
[#7657] ticket:651 Another attempt to fix tests freezing
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/751e996c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/751e996c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/751e996c
Branch: refs/heads/je/42cc_7657b
Commit: 751e996c034bfc6901c50af03dc67beecf510160
Parents: 26f23f1
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 16 17:08:06 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Sep 22 11:14:56 2014 +0300
----------------------------------------------------------------------
.../allura/tests/functional/test_site_admin.py | 22 ++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/751e996c/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 6168d46..2793410 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -390,33 +390,29 @@ class TestUserDetails(TestController):
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').disabled, False)
- r = self.app.get('/nf/admin/user/test-user')
+ 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')
+ 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').disabled, True)
- # don't leave user disabled, it causes tests to hang somewhere
- user = M.User.by_username('test-user')
- user.disabled = False
- ThreadLocalORMSession.flush_all()
+ assert_equal(M.User.by_username('test-user-3').disabled, True)
def test_enable_user(self):
- user = M.User.by_username('test-user')
+ user = M.User.by_username('test-user-3')
user.disabled = True
ThreadLocalORMSession.flush_all()
- assert_equal(M.User.by_username('test-user').disabled, True)
- r = self.app.get('/nf/admin/user/test-user')
+ 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')
+ 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').disabled, False)
+ assert_equal(M.User.by_username('test-user-3').disabled, False)
def test_emails(self):
# add test@example.com