Merge remote-tracking branch 'origin/a158972595146231_parallel_testing'

openprocurement/tender/limited/tests/base.py

@@ -6,7 +6,7 @@
 from openprocurement.api.models import SANDBOX_MODE
 from openprocurement.api.utils import apply_data_patch
 from openprocurement.api.tests.base import test_tender_data as base_data
-from openprocurement.api.tests.base import BaseTenderWebTest, PrefixedRequestClass
+from openprocurement.api.tests.base import BaseTenderWebTest as BaseBaseTenderWebTest
 from openprocurement.api.tests.base import test_organization
 
 now = datetime.now()
@@ -34,22 +34,16 @@
     test_tender_negotiation_quick_data['procurementMethodDetails'] = 'quick, accelerator=1440'
 
 
-class BaseTenderWebTest(BaseTenderWebTest):
+class BaseTenderWebTest(BaseBaseTenderWebTest):
     initial_data = test_tender_data
     initial_status = None
     initial_bids = None
     initial_lots = None
+    relative_to = os.path.dirname(__file__)
 
     def setUp(self):
-        self.app = webtest.TestApp(
-            "config:tests.ini", relative_to=os.path.dirname(__file__))
-        self.app.RequestClass = PrefixedRequestClass
+        super(BaseBaseTenderWebTest, self).setUp()
         self.app.authorization = ('Basic', ('broker', ''))
-        self.couchdb_server = self.app.app.registry.couchdb_server
-        self.db = self.app.app.registry.db
-
-    def tearDown(self):
-        del self.couchdb_server[self.db.name]
 
     def set_status(self, status, extra=None):
         data = {'status': status}

versions.cfg

@@ -8,7 +8,7 @@ WebOb = 1.4.1
 WebTest = 2.0.18
 docutils = 0.12
 jsonpointer = 1.9
-nose = 1.3.4
+nose = 1.3.7
 py = 1.4.26
 pyramid = 1.5.7
 python-coveralls = 2.5.0