From 2f761fea9e72554806b012c64d00fcae80e1d254 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 24 Jan 2013 11:58:56 -0200 Subject: Source files stick to pep8. --- tests/test_leap_backend.py | 58 ++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 25 deletions(-) (limited to 'tests/test_leap_backend.py') diff --git a/tests/test_leap_backend.py b/tests/test_leap_backend.py index f19eb360..c19ca666 100644 --- a/tests/test_leap_backend.py +++ b/tests/test_leap_backend.py @@ -33,11 +33,11 @@ from leap.soledad.tests.test_encrypted import ( class SoledadTest(unittest.TestCase): - PREFIX = "/var/tmp" + PREFIX = "/var/tmp" GNUPG_HOME = "%s/gnupg" % PREFIX - DB1_FILE = "%s/db1.u1db" % PREFIX - DB2_FILE = "%s/db2.u1db" % PREFIX - EMAIL = 'leap@leap.se' + DB1_FILE = "%s/db1.u1db" % PREFIX + DB2_FILE = "%s/db2.u1db" % PREFIX + EMAIL = 'leap@leap.se' def setUp(self): super(SoledadTest, self).setUp() @@ -102,7 +102,8 @@ def make_document_for_test(test, doc_id, rev, content, has_conflicts=False): doc_id, rev, content, has_conflicts=has_conflicts) -def make_leap_document_for_test(test, doc_id, rev, content, has_conflicts=False): +def make_leap_document_for_test(test, doc_id, rev, content, + has_conflicts=False): return leap_backend.LeapDocument( doc_id, rev, content, has_conflicts=has_conflicts, soledad=test._soledad) @@ -117,11 +118,11 @@ def make_leap_encrypted_document_for_test(test, doc_id, rev, encrypted_content, LEAP_SCENARIOS = [ - ('http', {'make_database_for_test': make_leap_database_for_test, - 'copy_database_for_test': copy_leap_database_for_test, - 'make_document_for_test': make_leap_document_for_test, - 'make_app_with_state': make_http_app}), - ] + ('http', {'make_database_for_test': make_leap_database_for_test, + 'copy_database_for_test': copy_leap_database_for_test, + 'make_document_for_test': make_leap_document_for_test, + 'make_app_with_state': make_http_app}), +] class LeapTests(test_backends.AllDatabaseTests, SoledadTest): @@ -133,24 +134,26 @@ class LeapTests(test_backends.AllDatabaseTests, SoledadTest): # The following tests come from `u1db.tests.test_http_database`. #----------------------------------------------------------------------------- -class TestLeapDatabaseSimpleOperations(test_http_database.TestHTTPDatabaseSimpleOperations): +class TestLeapDatabaseSimpleOperations( + test_http_database.TestHTTPDatabaseSimpleOperations): def setUp(self): - super(test_http_database.TestHTTPDatabaseSimpleOperations, self).setUp() + super(test_http_database.TestHTTPDatabaseSimpleOperations, + self).setUp() self.db = leap_backend.LeapDatabase('dbase') self.db._conn = object() # crash if used self.got = None self.response_val = None def _request(method, url_parts, params=None, body=None, - content_type=None): + content_type=None): self.got = method, url_parts, params, body, content_type if isinstance(self.response_val, Exception): raise self.response_val return self.response_val def _request_json(method, url_parts, params=None, body=None, - content_type=None): + content_type=None): self.got = method, url_parts, params, body, content_type if isinstance(self.response_val, Exception): raise self.response_val @@ -165,11 +168,13 @@ class TestLeapDatabaseSimpleOperations(test_http_database.TestHTTPDatabaseSimple self.assertEqual(st._url, self.db._url) -class TestLeapDatabaseCtrWithCreds(test_http_database.TestHTTPDatabaseCtrWithCreds): +class TestLeapDatabaseCtrWithCreds( + test_http_database.TestHTTPDatabaseCtrWithCreds): pass -class TestLeapDatabaseIntegration(test_http_database.TestHTTPDatabaseIntegration): +class TestLeapDatabaseIntegration( + test_http_database.TestHTTPDatabaseIntegration): def test_non_existing_db(self): db = leap_backend.LeapDatabase(self.getURL('not-there')) @@ -190,7 +195,7 @@ class TestLeapDatabaseIntegration(test_http_database.TestHTTPDatabaseIntegration def test_open_database_existing(self): self.request_state._create_database('db0') db = leap_backend.LeapDatabase.open_database(self.getURL('db0'), - create=False) + create=False) self.assertIs(None, db.get_doc('doc1')) def test_open_database_non_existing(self): @@ -201,7 +206,7 @@ class TestLeapDatabaseIntegration(test_http_database.TestHTTPDatabaseIntegration def test_open_database_create(self): db = leap_backend.LeapDatabase.open_database(self.getURL('new'), - create=True) + create=True) self.assertIs(None, db.get_doc('doc1')) def test_delete_database_existing(self): @@ -213,7 +218,7 @@ class TestLeapDatabaseIntegration(test_http_database.TestHTTPDatabaseIntegration def test_doc_ids_needing_quoting(self): db0 = self.request_state._create_database('db0') db = leap_backend.LeapDatabase.open_database(self.getURL('db0'), - create=False) + create=False) doc = leap_backend.LeapDocument('%fff', None, '{}') db.put_doc(doc) self.assertGetDoc(db0, '%fff', doc.rev, '{}', False) @@ -248,7 +253,8 @@ class TestLeapPyDocument(test_document.TestPyDocument, SoledadTest): # The following tests come from `u1db.tests.test_remote_sync_target`. #----------------------------------------------------------------------------- -class TestLeapSyncTargetBasics(test_remote_sync_target.TestHTTPSyncTargetBasics): +class TestLeapSyncTargetBasics( + test_remote_sync_target.TestHTTPSyncTargetBasics): def test_parse_url(self): remote_target = leap_backend.LeapSyncTarget('http://127.0.0.1:12345/') @@ -257,6 +263,7 @@ class TestLeapSyncTargetBasics(test_remote_sync_target.TestHTTPSyncTargetBasics) self.assertEqual(12345, remote_target._url.port) self.assertEqual('/', remote_target._url.path) + class TestLeapParsingSyncStream(test_remote_sync_target.TestParsingSyncStream): def test_wrong_start(self): @@ -344,7 +351,7 @@ class TestRemoteSyncTargets(tests.TestCaseWithServer): ('oauth_http', {'make_app_with_state': make_oauth_http_app, 'make_document_for_test': make_leap_document_for_test, 'sync_target': oauth_leap_sync_target}), - ] + ] #----------------------------------------------------------------------------- @@ -358,14 +365,15 @@ def oauth_https_sync_target(test, host, path): tests.token1.key, tests.token1.secret) return st -class TestLeapSyncTargetHttpsSupport(test_https.TestHttpSyncTargetHttpsSupport, SoledadTest): + +class TestLeapSyncTargetHttpsSupport(test_https.TestHttpSyncTargetHttpsSupport, + SoledadTest): scenarios = [ ('oauth_https', {'server_def': test_https.https_server_def, 'make_app_with_state': make_oauth_http_app, 'make_document_for_test': make_leap_document_for_test, - 'sync_target': oauth_https_sync_target - }), - ] + 'sync_target': oauth_https_sync_target, + }), ] load_tests = tests.load_with_scenarios -- cgit v1.2.3