[2/5] git commit: actually fix the flaky test

[jo...@apache.org]

actually fix the flaky test


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

Branch: refs/heads/cj/7134
Commit: 800530cc07bf87fe570db243c7ebdc41487e79b4
Parents: f9c81e2
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Mar 25 22:21:38 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Mar 25 22:21:38 2014 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_admin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/800530cc/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 0861a15..fd77f6d 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -25,7 +25,7 @@ import logging
 
 import tg
 import PIL
-from nose.tools import assert_equals, assert_in, assert_not_in, assert_greater_equal
+from nose.tools import assert_equals, assert_in, assert_not_in
 from ming.orm.ormsession import ThreadLocalORMSession
 from tg import expose
 from pylons import tmpl_context as c, app_globals as g
@@ -325,8 +325,8 @@ class TestProjectAdmin(TestController):
     def test_tool_paging(self):
         r = self.app.get('/admin/tools')
         items = r.html.findAll('ul', {'class': 'deck'})
-        log.debug('test_tool_paging: got %s tools: %s', len(items), items)
-        assert_greater_equal(2, len(items))
+        # sometimes the activity tool is present, sometimes it isn't - not sure why
+        assert_in(len(items), (2, 3))
         r = self.app.get('/admin/tools?limit=1&page=0')
         assert_equals(1, len(r.html.findAll('ul', {'class': 'deck'})))
         r = self.app.get('/admin/tools?limit=1&page=1')