← Back to branch summary

~sil/u1db/http-all-docs

« back to all changes in this revision

Viewing changes to u1db/tests/commandline/test_client.py

  • Committer: Tarmac
  • Author(s): Eric Casteleijn
  • Date: 2012-08-14 14:55:10 UTC
  • mfrom: (375.1.1 deprecate-simplejson)
  • Revision ID: tarmac-20120814145510-9q1yb1vt8oyrgpo9
Removed simplejson as a hard dependency. It will still be used if present.

Show diffs side-by-side

added added

removed removed

Lines of Context:
u1db/tests/commandline/test_client.py
17
17
import cStringIO
18
18
import os
19
19
import sys
20
 
import simplejson
 
20
try:
 
21
    import simplejson as json
 
22
except ImportError:
 
23
    import json  # noqa
21
24
import subprocess
22
25
 
23
26
from u1db import (
253
256
 
254
257
    def setUp(self):
255
258
        super(TestCmdGet, self).setUp()
256
 
        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-test-doc')
 
259
        self.doc = self.db.create_doc_from_json(
 
260
            tests.simple_doc, doc_id='my-test-doc')
257
261
 
258
262
    def test_get_simple(self):
259
263
        cmd = self.make_command(client.CmdGet)
292
296
 
293
297
    def setUp(self):
294
298
        super(TestCmdGetDocConflicts, self).setUp()
295
 
        self.doc1 = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-doc')
 
299
        self.doc1 = self.db.create_doc_from_json(
 
300
            tests.simple_doc, doc_id='my-doc')
296
301
        self.doc2 = self.make_document('my-doc', 'other:1', '{}', False)
297
302
        self.db._put_doc_if_newer(
298
303
            self.doc2, save_conflict=True, replica_uid='r', replica_gen=1,
302
307
        self.db.create_doc_from_json(tests.simple_doc, doc_id='a-doc')
303
308
        cmd = self.make_command(client.CmdGetDocConflicts)
304
309
        cmd.run(self.db_path, 'a-doc')
305
 
        self.assertEqual([],
306
 
                         simplejson.loads(cmd.stdout.getvalue()))
 
310
        self.assertEqual([], json.loads(cmd.stdout.getvalue()))
307
311
        self.assertEqual('', cmd.stderr.getvalue())
308
312
 
309
313
    def test_get_doc_conflicts_simple(self):
310
314
        cmd = self.make_command(client.CmdGetDocConflicts)
311
315
        cmd.run(self.db_path, 'my-doc')
312
 
        self.assertEqual([dict(rev=self.doc2.rev, content=self.doc2.content),
313
 
                          dict(rev=self.doc1.rev, content=self.doc1.content),
314
 
                          ],
315
 
                         simplejson.loads(cmd.stdout.getvalue()))
 
316
        self.assertEqual(
 
317
            [dict(rev=self.doc2.rev, content=self.doc2.content),
 
318
             dict(rev=self.doc1.rev, content=self.doc1.content)],
 
319
            json.loads(cmd.stdout.getvalue()))
316
320
        self.assertEqual('', cmd.stderr.getvalue())
317
321
 
318
322
    def test_get_doc_conflicts_no_db(self):
354
358
 
355
359
    def setUp(self):
356
360
        super(TestCmdPut, self).setUp()
357
 
        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-test-doc')
 
361
        self.doc = self.db.create_doc_from_json(
 
362
            tests.simple_doc, doc_id='my-test-doc')
358
363
 
359
364
    def test_put_simple(self):
360
365
        cmd = self.make_command(client.CmdPut)
416
421
 
417
422
    def setUp(self):
418
423
        super(TestCmdResolve, self).setUp()
419
 
        self.doc1 = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-doc')
 
424
        self.doc1 = self.db.create_doc_from_json(
 
425
            tests.simple_doc, doc_id='my-doc')
420
426
        self.doc2 = self.make_document('my-doc', 'other:1', '{}', False)
421
427
        self.db._put_doc_if_newer(
422
428
            self.doc2, save_conflict=True, replica_uid='r', replica_gen=1,
477
483
        self.db2 = u1db_open(self.db2_path, create=True)
478
484
        self.addCleanup(self.db2.close)
479
485
        self.db2._set_replica_uid('test2')
480
 
        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='test-id')
481
 
        self.doc2 = self.db2.create_doc_from_json(tests.nested_doc, doc_id='my-test-id')
 
486
        self.doc = self.db.create_doc_from_json(
 
487
            tests.simple_doc, doc_id='test-id')
 
488
        self.doc2 = self.db2.create_doc_from_json(
 
489
            tests.nested_doc, doc_id='my-test-id')
482
490
 
483
491
    def test_sync(self):
484
492
        cmd = self.make_command(client.CmdSync)
674
682
        cmd = self.make_command(client.CmdGetFromIndex)
675
683
        retval = cmd.run(self.db_path, "index", ["value"])
676
684
        self.assertEqual(retval, None)
677
 
        self.assertEqual(sorted(simplejson.loads(cmd.stdout.getvalue())),
 
685
        self.assertEqual(sorted(json.loads(cmd.stdout.getvalue())),
678
686
                         sorted([dict(id=doc1.doc_id,
679
687
                                      rev=doc1.rev,
680
688
                                      content=doc1.content),