Merge branch 'develop' of ssh://code.leap.se/leap_client into develop

Conflicts:
	src/leap/soledad/__init__.py

5 files changed, 8 insertions, 6 deletions

diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 4108d259..9b521a95 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -13,7 +13,7 @@ keyring
 python-dateutil
 sh
 pygeoip # optional
-#ping # to be deprecated
+ping # to be deprecated
 
 # soledad deps -- will move to its own repo soon
 python-gnupg
diff --git a/pkg/test-requirements.pip b/pkg/test-requirements.pip
index 43bec43c..edd53b16 100644
--- a/pkg/test-requirements.pip
+++ b/pkg/test-requirements.pip
@@ -1,3 +1,4 @@
+six>=1.1,<1.2 # soledad req (nose2)
 unittest2  # TODO we should include this dep only for python2.6
 coverage
 mock
@@ -7,5 +8,6 @@ sphinx>=1.1.2
 nose-exclude
 
 # for soledad * to be splitted *
+nose2
 testscenarios
 testtools
diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py
index b7fab193..5e8d6126 100644
--- a/src/leap/soledad/tests/test_couch.py
+++ b/src/leap/soledad/tests/test_couch.py
@@ -41,7 +41,7 @@ def make_couch_database_for_test(test, replica_uid):
 
 def copy_couch_database_for_test(test, db):
     new_db = couch.CouchDatabase('http://localhost:5984',
-                                 db._replica_uid+'_copy',
+                                 db._replica_uid + '_copy',
                                  replica_uid=db._replica_uid or 'test')
     gen, docs = db.get_all_docs(include_deleted=True)
     for doc in docs:
@@ -112,7 +112,7 @@ class CouchWithConflictsTests(
 # the server, so indexing makes no sense. Thus, we ignore index testing for
 # now.
 
-#class CouchIndexTests(DatabaseIndexTests):
+# class CouchIndexTests(DatabaseIndexTests):
 #
 #    scenarios = COUCH_SCENARIOS
 #
diff --git a/src/leap/soledad/tests/u1db_tests/test_backends.py b/src/leap/soledad/tests/u1db_tests/test_backends.py
index 81150994..a53b01ba 100644
--- a/src/leap/soledad/tests/u1db_tests/test_backends.py
+++ b/src/leap/soledad/tests/u1db_tests/test_backends.py
@@ -953,7 +953,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
     def test_put_doc_if_newer_autoresolve_3(self):
         doc_a1 = self.db.create_doc_from_json(simple_doc)
         doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', "{}")
-        doc_a2 = self.make_document(doc_a1.doc_id, 'test:2',  '{"a":"42"}')
+        doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
         doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', "{}")
         state, _ = self.db._put_doc_if_newer(
             doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1,
@@ -979,7 +979,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
     def test_put_doc_if_newer_autoresolve_4(self):
         doc_a1 = self.db.create_doc_from_json(simple_doc)
         doc_a1b1 = self.make_document(doc_a1.doc_id, 'test:1|other:1', None)
-        doc_a2 = self.make_document(doc_a1.doc_id, 'test:2',  '{"a":"42"}')
+        doc_a2 = self.make_document(doc_a1.doc_id, 'test:2', '{"a":"42"}')
         doc_a3 = self.make_document(doc_a1.doc_id, 'test:3', None)
         state, _ = self.db._put_doc_if_newer(
             doc_a1b1, save_conflict=True, replica_uid='r', replica_gen=1,
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):