diff options
author | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-01-24 14:29:31 -0200 |
commit | 1a9eb8218722ae64643c8e77f381c5609a89e18f (patch) | |
tree | 37001cefd064f3acd71ffc916508a206629bd4a0 /src/leap/soledad/tests/u1db_tests/test_http_database.py | |
parent | 04f7e29aaf29edd693265831a609db681641390d (diff) | |
parent | cfeddae5b94a6ab9883f3226702dee31850d638f (diff) |
Merge branch 'develop' of ssh://code.leap.se/leap_client into develop
Conflicts:
src/leap/soledad/__init__.py
Diffstat (limited to 'src/leap/soledad/tests/u1db_tests/test_http_database.py')
-rw-r--r-- | src/leap/soledad/tests/u1db_tests/test_http_database.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/soledad/tests/u1db_tests/test_http_database.py b/src/leap/soledad/tests/u1db_tests/test_http_database.py index 40a839a5..f21e6da1 100644 --- a/src/leap/soledad/tests/u1db_tests/test_http_database.py +++ b/src/leap/soledad/tests/u1db_tests/test_http_database.py @@ -200,7 +200,7 @@ class TestHTTPDatabaseCtrWithCreds(tests.TestCase): 'token_key': tests.token1.key, 'token_secret': tests.token1.secret }}) - self.assertIn('oauth', db1._creds) + self.assertIn('oauth', db1._creds) class TestHTTPDatabaseIntegration(tests.TestCaseWithServer): |