summaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-09-13 03:27:12 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-09-13 03:27:12 -0300
commit3f5003afee45c02bb9668c150506447cf0d2f52c (patch)
treeea2dfe1915adaf761b88de0f22fe411525aa1c7f /common/src
parent197ad8b7c6a5d180b798f4dfcbe7f6d5fdd18298 (diff)
[tests] test_couch does not need a server
Removing unused code as this test case does not need a server.
Diffstat (limited to 'common/src')
-rw-r--r--common/src/leap/soledad/common/tests/test_couch.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/common/src/leap/soledad/common/tests/test_couch.py b/common/src/leap/soledad/common/tests/test_couch.py
index 28f90e5d..ae7933c3 100644
--- a/common/src/leap/soledad/common/tests/test_couch.py
+++ b/common/src/leap/soledad/common/tests/test_couch.py
@@ -43,7 +43,6 @@ from leap.soledad.common.tests.util import sync_via_synchronizer
from leap.soledad.common.tests.u1db_tests import test_backends
from leap.soledad.common.tests.u1db_tests import DatabaseBaseTests
-from leap.soledad.common.tests.u1db_tests import TestCaseWithServer
from u1db.backends.inmemory import InMemoryIndex
@@ -208,7 +207,6 @@ nested_doc = tests.nested_doc
class CouchDatabaseSyncTargetTests(
TestWithScenarios,
DatabaseBaseTests,
- TestCaseWithServer,
CouchDBTestCase):
# TODO: implement _set_trace_hook(_shallow) in CouchSyncTarget so
@@ -231,20 +229,11 @@ class CouchDatabaseSyncTargetTests(
def setUp(self):
CouchDBTestCase.setUp(self)
- # from TestCaseWithServer.setUp
- self.server = self.server_thread = self.port = None
# other stuff
self.db, self.st = self.create_db_and_target(self)
self.other_changes = []
def tearDown(self):
- # from TestCaseWithServer.tearDown
- if self.server is not None:
- self.server.shutdown()
- self.server_thread.join()
- self.server.server_close()
- if self.port:
- self.port.stopListening()
self.db.close()
CouchDBTestCase.tearDown(self)