U1DB

Merge lp:~thisfred/u1db/regenerator into lp:u1db

  1. regenerator
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 401
Merged at revision: 401
Proposed branch: lp:~thisfred/u1db/regenerator
Merge into: lp:u1db
Diff against target: 61 lines (+8/-8)
1 file modified
u1db/tests/test_backends.py (+8/-8)
To merge this branch: bzr merge lp:~thisfred/u1db/regenerator
Reviewer Review Type Date Requested Status
John O'Brien (community) Approve
Review via email: mp+124721@code.launchpad.net

Commit message

Fix it so the tests expect a generator in second position of the return value of get_all_docs

Description of the change

Fix it so the tests expect a generator in second position of the return value of get_all_docs

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'u1db/tests/test_backends.py'
2--- u1db/tests/test_backends.py 2012-09-17 14:27:05 +0000
3+++ u1db/tests/test_backends.py 2012-09-17 15:48:18 +0000
4@@ -364,19 +364,19 @@
5 self.assertRaises(errors.InvalidDocId, self.db.put_doc, doc)
6
7 def test_get_all_docs_empty(self):
8- self.assertEqual([], list(self.db.get_all_docs())[1])
9+ self.assertEqual([], list(self.db.get_all_docs()[1]))
10
11 def test_get_all_docs(self):
12 doc1 = self.db.create_doc_from_json(simple_doc)
13 doc2 = self.db.create_doc_from_json(nested_doc)
14 self.assertEqual(
15- sorted([doc1, doc2]), sorted(list(self.db.get_all_docs())[1]))
16+ sorted([doc1, doc2]), sorted(list(self.db.get_all_docs()[1])))
17
18 def test_get_all_docs_exclude_deleted(self):
19 doc1 = self.db.create_doc_from_json(simple_doc)
20 doc2 = self.db.create_doc_from_json(nested_doc)
21 self.db.delete_doc(doc2)
22- self.assertEqual([doc1], list(self.db.get_all_docs())[1])
23+ self.assertEqual([doc1], list(self.db.get_all_docs()[1]))
24
25 def test_get_all_docs_include_deleted(self):
26 doc1 = self.db.create_doc_from_json(simple_doc)
27@@ -384,12 +384,12 @@
28 self.db.delete_doc(doc2)
29 self.assertEqual(
30 sorted([doc1, doc2]),
31- sorted(list(self.db.get_all_docs(include_deleted=True))[1]))
32+ sorted(list(self.db.get_all_docs(include_deleted=True)[1])))
33
34 def test_get_all_docs_generation(self):
35 self.db.create_doc_from_json(simple_doc)
36 self.db.create_doc_from_json(nested_doc)
37- self.assertEqual(2, list(self.db.get_all_docs())[0])
38+ self.assertEqual(2, self.db.get_all_docs()[0])
39
40 def test_simple_put_doc_if_newer(self):
41 doc = self.make_document('my-doc-id', 'test:1', simple_doc)
42@@ -676,8 +676,8 @@
43 self.db._put_doc_if_newer(
44 alt_doc, save_conflict=True, replica_uid='r', replica_gen=1,
45 replica_trans_id='foo')
46- _, docs = list(self.db.get_all_docs())
47- self.assertTrue(docs[0].has_conflicts)
48+ _, docs = self.db.get_all_docs()
49+ self.assertTrue(list(docs)[0].has_conflicts)
50
51 def test_get_doc_conflicts_unconflicted(self):
52 doc = self.db.create_doc_from_json(simple_doc)
53@@ -1837,7 +1837,7 @@
54 self.db.set_document_factory(TestAlternativeDocument)
55 self.db.create_doc(self.simple_doc)
56 self.assertTrue(isinstance(
57- list(self.db.get_all_docs())[1][0], TestAlternativeDocument))
58+ list(self.db.get_all_docs()[1])[0], TestAlternativeDocument))
59
60 def test_get_docs_conflicted_with_factory(self):
61 self.db.set_document_factory(TestAlternativeDocument)

Subscribers

People subscribed via source and target branches