Merge remote-tracking branch 'origin/a158972595146231_parallel_testing'

openprocurement · Aug 16, 2016 · 1c38af6 · 1c38af6
2 parents c0c0d67 + 2243489
commit 1c38af6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/openprocurement/tender/openua/tests/base.py b/openprocurement/tender/openua/tests/base.py
@@ -79,6 +79,7 @@ class BaseTenderUAWebTest(BaseTenderWebTest):
     initial_status = None
     initial_bids = None
     initial_lots = None
+    relative_to = os.path.dirname(__file__)
 
     def go_to_enquiryPeriod_end(self):
         now = get_now()
@@ -97,12 +98,9 @@ def go_to_enquiryPeriod_end(self):
         })
 
     def setUp(self):
-        self.app = webtest.TestApp(
-            "config:tests.ini", relative_to=os.path.dirname(__file__))
-        self.app.RequestClass = PrefixedRequestClass
+        super(BaseTenderWebTest, self).setUp()
         self.app.authorization = ('Basic', ('broker', ''))
-        self.couchdb_server = self.app.app.registry.couchdb_server
-        self.db = self.app.app.registry.db
+
 
     def set_status(self, status, extra=None):
         data = {'status': status}
@@ -250,10 +248,6 @@ def set_status(self, status, extra=None):
         return response
 
 
-    def tearDown(self):
-        del self.couchdb_server[self.db.name]
-
-
 class BaseTenderUAContentWebTest(BaseTenderUAWebTest):
     initial_data = test_tender_data
     initial_status = None

diff --git a/versions.cfg b/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