From cfff46ff9becdbe5cf48816870e625ed253ecc57 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Sun, 17 Sep 2017 12:08:25 -0300
Subject: [refactor] move tests to root of repository

Tests entrypoint was in a testing/ subfolder in the root of the
repository. This was made mainly because we had some common files for
tests and we didn't want to ship them (files in testing/test_soledad,
which is itself a python package. This sometimes causes errors when
loading tests (it seems setuptools is confused with having one python
package in a subdirectory of another).

This commit moves the tests entrypoint to the root of the repository.

Closes: #8952
---
 testing/test_soledad/u1db_tests/test_https.py | 105 --------------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 testing/test_soledad/u1db_tests/test_https.py

(limited to 'testing/test_soledad/u1db_tests/test_https.py')

diff --git a/testing/test_soledad/u1db_tests/test_https.py b/testing/test_soledad/u1db_tests/test_https.py
deleted file mode 100644
index 2e75afd1..00000000
--- a/testing/test_soledad/u1db_tests/test_https.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""Test support for client-side https support."""
-
-import os
-import ssl
-import sys
-
-from paste import httpserver
-from unittest import skip
-
-from leap.soledad.common.l2db.remote import http_client
-
-from leap import soledad
-from test_soledad import u1db_tests as tests
-
-
-def https_server_def():
-    def make_server(host_port, application):
-        from OpenSSL import SSL
-        cert_file = os.path.join(os.path.dirname(__file__), 'testing-certs',
-                                 'testing.cert')
-        key_file = os.path.join(os.path.dirname(__file__), 'testing-certs',
-                                'testing.key')
-        ssl_context = SSL.Context(SSL.SSLv23_METHOD)
-        ssl_context.use_privatekey_file(key_file)
-        ssl_context.use_certificate_chain_file(cert_file)
-        srv = httpserver.WSGIServerBase(application, host_port,
-                                        httpserver.WSGIHandler,
-                                        ssl_context=ssl_context
-                                        )
-
-        def shutdown_request(req):
-            req.shutdown()
-            srv.close_request(req)
-
-        srv.shutdown_request = shutdown_request
-        application.base_url = "https://localhost:%s" % srv.server_address[1]
-        return srv
-    return make_server, "shutdown", "https"
-
-
-@skip("Skiping tests imported from U1DB.")
-class TestHttpSyncTargetHttpsSupport(tests.TestCaseWithServer):
-
-    scenarios = []
-
-    def setUp(self):
-        try:
-            import OpenSSL  # noqa
-        except ImportError:
-            self.skipTest("Requires pyOpenSSL")
-        self.cacert_pem = os.path.join(os.path.dirname(__file__),
-                                       'testing-certs', 'cacert.pem')
-        # The default u1db http_client class for doing HTTPS only does HTTPS
-        # if the platform is linux. Because of this, soledad replaces that
-        # class with one that will do HTTPS independent of the platform. In
-        # order to maintain the compatibility with u1db default tests, we undo
-        # that replacement here.
-        http_client._VerifiedHTTPSConnection = \
-            soledad.client.api.old__VerifiedHTTPSConnection
-        super(TestHttpSyncTargetHttpsSupport, self).setUp()
-
-    def getSyncTarget(self, host, path=None, cert_file=None):
-        if self.server is None:
-            self.startServer()
-        return self.sync_target(self, host, path, cert_file=cert_file)
-
-    def test_working(self):
-        self.startServer()
-        db = self.request_state._create_database('test')
-        self.patch(http_client, 'CA_CERTS', self.cacert_pem)
-        remote_target = self.getSyncTarget('localhost', 'test')
-        remote_target.record_sync_info('other-id', 2, 'T-id')
-        self.assertEqual(
-            (2, 'T-id'), db._get_replica_gen_and_trans_id('other-id'))
-
-    def test_cannot_verify_cert(self):
-        if not sys.platform.startswith('linux'):
-            self.skipTest(
-                "XXX certificate verification happens on linux only for now")
-        self.startServer()
-        # don't print expected traceback server-side
-        self.server.handle_error = lambda req, cli_addr: None
-        self.request_state._create_database('test')
-        remote_target = self.getSyncTarget('localhost', 'test')
-        try:
-            remote_target.record_sync_info('other-id', 2, 'T-id')
-        except ssl.SSLError as e:
-            self.assertIn("certificate verify failed", str(e))
-        else:
-            self.fail("certificate verification should have failed.")
-
-    def test_host_mismatch(self):
-        if not sys.platform.startswith('linux'):
-            self.skipTest(
-                "XXX certificate verification happens on linux only for now")
-        self.startServer()
-        self.request_state._create_database('test')
-        self.patch(http_client, 'CA_CERTS', self.cacert_pem)
-        remote_target = self.getSyncTarget('127.0.0.1', 'test')
-        self.assertRaises(
-            http_client.CertificateError, remote_target.record_sync_info,
-            'other-id', 2, 'T-id')
-
-
-load_tests = tests.load_with_scenarios
-- 
cgit v1.2.3