Use Twisted trial for running tests.

13 files changed, 56 insertions, 1 deletions

diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip
index 9302450c..c72c9fc4 100644
--- a/common/pkg/requirements-testing.pip
+++ b/common/pkg/requirements-testing.pip
@@ -3,3 +3,4 @@ testscenarios
 leap.common
 leap.soledad.server
 leap.soledad.client
+setuptools-trial
diff --git a/common/setup.cfg b/common/setup.cfg
new file mode 100644
index 00000000..c71bffa0
--- /dev/null
+++ b/common/setup.cfg
@@ -0,0 +1,2 @@
+[aliases]
+test = trial
diff --git a/common/setup.py b/common/setup.py
index 3650a15a..92f4827d 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -267,7 +267,7 @@ setup(
     namespace_packages=["leap", "leap.soledad"],
     packages=find_packages('src', exclude=['leap.soledad.common.tests']),
     package_dir={'': 'src'},
-    test_suite='leap.soledad.common.tests.load_tests',
+    test_suite='leap.soledad.common.tests',
     install_requires=utils.parse_requirements(),
     tests_require=utils.parse_requirements(
         reqfiles=['pkg/requirements-testing.pip']),
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py b/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
index 54adcde1..27fc50dc 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
@@ -40,6 +40,8 @@ from u1db.remote import (
     http_database,
 )
 
+from unittest import skip
+
 
 def make_http_database_for_test(test, replica_uid, path='test', *args):
     test.startServer()
@@ -79,6 +81,7 @@ class TestAlternativeDocument(DocumentBase):
     """A (not very) alternative implementation of Document."""
 
 
+@skip("Skiping tests imported from U1DB.")
 class AllDatabaseTests(tests.DatabaseBaseTests, tests.TestCaseWithServer):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS + [
@@ -327,6 +330,7 @@ class AllDatabaseTests(tests.DatabaseBaseTests, tests.TestCaseWithServer):
         self.assertGetDoc(self.db, doc.doc_id, doc.rev, nested_doc, False)
 
 
+@skip("Skiping tests imported from U1DB.")
 class DocumentSizeTests(tests.DatabaseBaseTests):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS
@@ -351,6 +355,7 @@ class DocumentSizeTests(tests.DatabaseBaseTests):
         self.assertEqual(1000000, self.db.document_size_limit)
 
 
+@skip("Skiping tests imported from U1DB.")
 class LocalDatabaseTests(tests.DatabaseBaseTests):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS
@@ -609,6 +614,7 @@ class LocalDatabaseTests(tests.DatabaseBaseTests):
                          self.db.whats_changed(2))
 
 
+@skip("Skiping tests imported from U1DB.")
 class LocalDatabaseValidateGenNTransIdTests(tests.DatabaseBaseTests):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS
@@ -633,6 +639,7 @@ class LocalDatabaseValidateGenNTransIdTests(tests.DatabaseBaseTests):
             self.db.validate_gen_and_trans_id, gen + 1, trans_id)
 
 
+@skip("Skiping tests imported from U1DB.")
 class LocalDatabaseValidateSourceGenTests(tests.DatabaseBaseTests):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS
@@ -652,6 +659,7 @@ class LocalDatabaseValidateSourceGenTests(tests.DatabaseBaseTests):
             self.db._validate_source, 'other', 1, 'T-sad')
 
 
+@skip("Skiping tests imported from U1DB.")
 class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
     # test supporting/functionality around storing conflicts
 
@@ -1028,6 +1036,7 @@ class LocalDatabaseWithConflictsTests(tests.DatabaseBaseTests):
         self.assertRaises(errors.ConflictedDoc, self.db.delete_doc, doc2)
 
 
+@skip("Skiping tests imported from U1DB.")
 class DatabaseIndexTests(tests.DatabaseBaseTests):
 
     scenarios = tests.LOCAL_DATABASES_SCENARIOS
@@ -1834,6 +1843,7 @@ class DatabaseIndexTests(tests.DatabaseBaseTests):
         self.assertParseError('combine(lower(x)x,foo)')
 
 
+@skip("Skiping tests imported from U1DB.")
 class PythonBackendTests(tests.DatabaseBaseTests):
 
     def setUp(self):
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_document.py b/common/src/leap/soledad/common/tests/u1db_tests/test_document.py
index 8b30ed51..d8a27f51 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_document.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_document.py
@@ -15,11 +15,13 @@
 # along with u1db.  If not, see <http://www.gnu.org/licenses/>.
 
 
+from unittest import skip
 from u1db import errors
 
 from leap.soledad.common.tests import u1db_tests as tests
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestDocument(tests.TestCase):
 
     scenarios = ([(
@@ -83,6 +85,7 @@ class TestDocument(tests.TestCase):
         self.assertEqual(len('a' + 'b'), doc_a.get_size())
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestPyDocument(tests.TestCase):
 
     scenarios = ([(
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py b/common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py
index 789006ba..522eb476 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py
@@ -24,6 +24,8 @@ except ImportError:
     import json  # noqa
 import StringIO
 
+from unittest import skip 
+
 from u1db import (
     __version__ as _u1db_version,
     errors,
@@ -38,6 +40,7 @@ from u1db.remote import (
 )
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestFencedReader(tests.TestCase):
 
     def test_init(self):
@@ -145,6 +148,7 @@ class TestFencedReader(tests.TestCase):
         self.assertRaises(http_app.BadRequest, reader.getline)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPMethodDecorator(tests.TestCase):
 
     def test_args(self):
@@ -253,6 +257,7 @@ class parameters:
     max_entry_size = 100000
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPInvocationByMethodWithBody(tests.TestCase):
 
     def test_get(self):
@@ -433,6 +438,7 @@ class TestHTTPInvocationByMethodWithBody(tests.TestCase):
         self.assertRaises(http_app.BadRequest, invoke)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPResponder(tests.TestCase):
 
     def start_response(self, status, headers):
@@ -521,6 +527,7 @@ class TestHTTPResponder(tests.TestCase):
                          responder.content)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPApp(tests.TestCase):
 
     def setUp(self):
@@ -949,6 +956,7 @@ class TestHTTPApp(tests.TestCase):
         self.assertEqual({'error': 'unavailable'}, json.loads(parts[2]))
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestRequestHooks(tests.TestCase):
 
     def setUp(self):
@@ -1000,12 +1008,14 @@ class TestRequestHooks(tests.TestCase):
         self.assertEqual(['begin', 'bad-request'], calls)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPErrors(tests.TestCase):
 
     def test_wire_description_to_status(self):
         self.assertNotIn("error", http_errors.wire_description_to_status)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPAppErrorHandling(tests.TestCase):
 
     def setUp(self):
@@ -1113,6 +1123,7 @@ class TestHTTPAppErrorHandling(tests.TestCase):
         self.assertEqual(self.exc, exc)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestPluggableSyncExchange(tests.TestCase):
 
     def setUp(self):
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py b/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
index 08e9714e..f9e09cbd 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
@@ -26,6 +26,8 @@ from u1db import (
     errors,
 )
 
+from unittest import skip
+
 from leap.soledad.common.tests import u1db_tests as tests
 
 from u1db.remote import (
@@ -33,6 +35,7 @@ from u1db.remote import (
 )
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestEncoder(tests.TestCase):
 
     def test_encode_string(self):
@@ -45,6 +48,7 @@ class TestEncoder(tests.TestCase):
         self.assertEqual("false", http_client._encode_query_parameter(False))
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPClientBase(tests.TestCaseWithServer):
 
     def setUp(self):
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py b/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
index 9251000e..bf7ed5d3 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
@@ -27,6 +27,8 @@ from u1db import (
     Document,
 )
 
+from unittest import skip
+
 from leap.soledad.common.tests import u1db_tests as tests
 
 from u1db.remote import (
@@ -38,6 +40,7 @@ from leap.soledad.common.tests.u1db_tests.test_remote_sync_target import (
 )
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPDatabaseSimpleOperations(tests.TestCase):
 
     def setUp(self):
@@ -190,6 +193,7 @@ class TestHTTPDatabaseSimpleOperations(tests.TestCase):
         self.assertEqual(self.db._creds, st._creds)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPDatabaseCtrWithCreds(tests.TestCase):
 
     def test_ctr_with_creds(self):
@@ -202,6 +206,7 @@ class TestHTTPDatabaseCtrWithCreds(tests.TestCase):
         self.assertIn('oauth', db1._creds)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPDatabaseIntegration(tests.TestCaseWithServer):
 
     make_app_with_state = staticmethod(make_http_app)
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_https.py b/common/src/leap/soledad/common/tests/u1db_tests/test_https.py
index c5b316ed..cea175d6 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_https.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_https.py
@@ -5,6 +5,7 @@ import ssl
 import sys
 
 from paste import httpserver
+from unittest import skip
 
 from u1db.remote import (
     http_client,
@@ -51,6 +52,7 @@ def oauth_https_sync_target(test, host, path):
     return st
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHttpSyncTargetHttpsSupport(tests.TestCaseWithServer):
 
     scenarios = [
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_open.py b/common/src/leap/soledad/common/tests/u1db_tests/test_open.py
index 63406245..ee249e6e 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_open.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_open.py
@@ -22,12 +22,14 @@ from u1db import (
     errors,
     open as u1db_open,
 )
+from unittest import skip
 from leap.soledad.common.tests import u1db_tests as tests
 from u1db.backends import sqlite_backend
 from leap.soledad.common.tests.u1db_tests.test_backends \
     import TestAlternativeDocument
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestU1DBOpen(tests.TestCase):
 
     def setUp(self):
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py b/common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py
index 3793e0df..bd7e4103 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py
@@ -22,6 +22,8 @@ from u1db import (
     errors,
 )
 
+from unittest import skip
+
 from leap.soledad.common.tests import u1db_tests as tests
 
 from u1db.remote import (
@@ -31,6 +33,7 @@ from u1db.remote import (
 )
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestHTTPSyncTargetBasics(tests.TestCase):
 
     def test_parse_url(self):
@@ -41,6 +44,7 @@ class TestHTTPSyncTargetBasics(tests.TestCase):
         self.assertEqual('/', remote_target._url.path)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestParsingSyncStream(tests.TestCase):
 
     def test_wrong_start(self):
@@ -130,6 +134,7 @@ def oauth_http_sync_target(test, path):
     return st
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestRemoteSyncTargets(tests.TestCaseWithServer):
 
     scenarios = [
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py b/common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py
index 8292dd07..aed8a6e5 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py
@@ -27,6 +27,8 @@ from u1db import (
     query_parser,
 )
 
+from unittest import skip
+
 from leap.soledad.common.tests import u1db_tests as tests
 
 from u1db.backends import sqlite_backend
@@ -38,6 +40,7 @@ simple_doc = '{"key": "value"}'
 nested_doc = '{"key": "value", "sub": {"doc": "underneath"}}'
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestSQLiteDatabase(tests.TestCase):
 
     def test_atomic_initialize(self):
@@ -83,6 +86,7 @@ class TestSQLiteDatabase(tests.TestCase):
         self.assertTrue(db2._is_initialized(db1._get_sqlite_handle().cursor()))
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestSQLitePartialExpandDatabase(tests.TestCase):
 
     def setUp(self):
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_sync.py b/common/src/leap/soledad/common/tests/u1db_tests/test_sync.py
index 5e2bec86..bac1f177 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_sync.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_sync.py
@@ -26,6 +26,8 @@ from u1db import (
     SyncTarget,
 )
 
+from unittest import skip
+
 from leap.soledad.common.tests import u1db_tests as tests
 
 from u1db.backends import (
@@ -74,6 +76,7 @@ target_scenarios = [
 ]
 
 
+@skip("Skiping tests imported from U1DB.")
 class DatabaseSyncTargetTests(tests.DatabaseBaseTests,
                               tests.TestCaseWithServer):
 
@@ -462,6 +465,7 @@ sync_scenarios.append(('pyhttp', {
 }))
 
 
+@skip("Skiping tests imported from U1DB.")
 class DatabaseSyncTests(tests.DatabaseBaseTests,
                         tests.TestCaseWithServer):
 
@@ -1118,6 +1122,7 @@ class DatabaseSyncTests(tests.DatabaseBaseTests,
             errors.InvalidTransactionId, self.sync, self.db1, self.db2_copy)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestDbSync(tests.TestCaseWithServer):
 
     """Test db.sync remote sync shortcut"""
@@ -1190,6 +1195,7 @@ class TestDbSync(tests.TestCaseWithServer):
         self.assertEqual(1, s_gen)
 
 
+@skip("Skiping tests imported from U1DB.")
 class TestRemoteSyncIntegration(tests.TestCaseWithServer):
 
     """Integration tests for the most common sync scenario local -> remote"""