You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/01/29 21:28:07 UTC
[1/5] git commit: [#5699] Added more checks to chunked_find test
[#5699] Added more checks to chunked_find test
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f226da82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f226da82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f226da82
Branch: refs/heads/master
Commit: f226da8298e1cf62a970d1db42ed895947d070a1
Parents: eb93a4b
Author: Cory Johns <jo...@geek.net>
Authored: Tue Jan 29 20:27:32 2013 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Tue Jan 29 20:27:50 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/test_utils.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f226da82/Allura/allura/tests/test_utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index 41f6302..2095179 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -6,11 +6,13 @@ from os import path
import pylons
from webob import Request
from mock import Mock
+from nose.tools import assert_equal
from pygments import highlight
from pygments.lexers import get_lexer_for_filename
from alluratest.controller import setup_unit_test
+from allura import model as M
from allura.lib import utils
@@ -23,24 +25,22 @@ class TestChunkedIterator(unittest.TestCase):
p = M.User.upsert('sample-user-%d' % i)
def test_can_iterate(self):
- from allura import model as M
- chunks = [
- chunk for chunk in utils.chunked_find(M.User, {}, 2) ]
+ chunks = list(utils.chunked_find(M.User, {}, 2))
assert len(chunks) > 1, chunks
assert len(chunks[0]) == 2, chunks[0]
def test_filter_on_sort_key(self):
- from allura import model as M
query = {'username': {'$in': ['sample-user-1', 'sample-user-2', 'sample-user-3']}}
- chunks = [
- chunk for chunk in utils.chunked_find(M.User,
- query,
- 2,
- sort_key='username')
- ]
+ chunks = list(utils.chunked_find(M.User,
+ query,
+ 2,
+ sort_key='username'))
assert len(chunks) == 2, chunks
assert len(chunks[0]) == 2, chunks[0]
assert len(chunks[1]) == 1, chunks[1]
+ assert_equal(chunks[0][0].username, 'sample-user-1')
+ assert_equal(chunks[0][1].username, 'sample-user-2')
+ assert_equal(chunks[1][0].username, 'sample-user-3')
class TestChunkedList(unittest.TestCase):