Fix mango tests using custom db name

Makefile

@@ -339,7 +339,7 @@ mango-test: devclean all
 		--admin=adm:pass \
 		--no-eval "\
 COUCH_USER=adm COUCH_PASS=pass \
-src/mango/.venv/bin/nose2 -s src/mango/test -c src/mango/unittest.cfg $(MANGO_TEST_OPTS)"
+src/mango/.venv/bin/nose2 -F -s src/mango/test -c src/mango/unittest.cfg $(MANGO_TEST_OPTS)"
 
 
 .PHONY: weatherreport-test

Makefile.win

@@ -310,7 +310,7 @@ mango-test: devclean all
 		--admin=adm:pass \
 		"\
 env COUCH_USER=adm COUCH_PASS=pass \
-src\mango\.venv\Scripts\nose2 -s src\mango\test -c src\mango\unittest.cfg $(MANGO_TEST_OPTS)"
+src\mango\.venv\Scripts\nose2 -F -s src\mango\test -c src\mango\unittest.cfg $(MANGO_TEST_OPTS)"
 
 
 ################################################################################

src/mango/test/01-index-crud-test.py

@@ -25,7 +25,7 @@
 
 class IndexCrudTests(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
 
     def test_bad_fields(self):
         bad_fields = [
@@ -352,7 +352,7 @@ def test_out_of_sync(self):
 @unittest.skipUnless(mango.has_text_service(), "requires text service")
 class IndexCrudTextTests(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
 
     def test_create_text_idx(self):
         fields = [

src/mango/test/12-use-correct-index-test.py

@@ -50,7 +50,7 @@
 
 class ChooseCorrectIndexForDocs(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
 
     def test_choose_index_with_one_field_in_index(self):

src/mango/test/13-stable-update-test.py

@@ -35,7 +35,7 @@
 
 class SupportStableAndUpdate(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         # Hack to prevent auto-indexer from foiling update=False test
         # https://github.com/apache/couchdb/issues/2313
         self.db.save_doc(

src/mango/test/14-json-pagination-test.py

@@ -33,7 +33,7 @@
 
 class PaginateJsonDocs(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
 
     def test_all_docs_paginate_to_end(self):

src/mango/test/16-index-selectors-test.py

@@ -82,7 +82,7 @@
 
 class IndexSelectorJson(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
 
     def test_saves_partial_filter_selector_in_index(self):
@@ -189,7 +189,7 @@ def test_uses_partial_index_with_non_indexable_selector(self):
 @unittest.skipUnless(mango.has_text_service(), "requires text service")
 class IndexSelectorText(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
 
     def test_saves_partialfilterselector_in_index(self):

src/mango/test/17-multi-type-value-test.py

@@ -52,7 +52,7 @@ def test_can_query_with_age_and_name_range(self):
 
 class MultiValueFieldJSONTests(mango.DbPerClass, MultiValueFieldTests):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
         self.db.create_index(["name"])
         self.db.create_index(["age", "name"])
@@ -65,5 +65,5 @@ def setUp(self):
 
 class MultiValueFieldAllDocsTests(mango.DbPerClass, MultiValueFieldTests):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))

src/mango/test/18-json-sort.py

@@ -25,7 +25,7 @@
 
 class JSONIndexSortOptimisations(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
 
     def test_works_for_basic_case(self):

src/mango/test/19-find-conflicts.py

@@ -20,7 +20,7 @@
 
 class ChooseCorrectIndexForDocs(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOC))
         self.db.save_docs_with_conflicts(copy.deepcopy(CONFLICT))
 

src/mango/test/20-no-timeout-test.py

@@ -17,7 +17,7 @@
 
 class LongRunningMangoTest(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         docs = []
         for i in range(100000):
             docs.append({"_id": str(i), "another": "field"})

src/mango/test/24-text-paginated-test.py

@@ -24,7 +24,7 @@ class PaginatedResultsTest(mango.DbPerClass):
     UPDATES = 25
 
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.create_text_index(
             analyzer="keyword",
             default_field={},

src/mango/test/25-beginswith-test.py

@@ -28,7 +28,7 @@ def to_utf8_bytes(list):
 
 class BeginsWithOperator(mango.DbPerClass):
     def setUp(self):
-        self.db.recreate()
+        super().setUp(db_per_test=True)
         self.db.save_docs(copy.deepcopy(DOCS))
         self.db.create_index(["location"])
         self.db.create_index(["name", "location"])

src/mango/test/mango.py

@@ -80,10 +80,7 @@ def join(self):
 
 
 class Database(object):
-    def __init__(
-        self,
-        dbname,
-    ):
+    def __init__(self, dbname):
         self.dbname = dbname
         self.sess = requests.session()
         self.sess.auth = (COUCH_USER, COUCH_PASS)
@@ -107,24 +104,19 @@ def create(self, q=1, n=1, partitioned=False):
 
     def delete(self):
         r = self.sess.delete(self.url)
+        r.raise_for_status()
 
     def recreate(self):
-        NUM_TRIES = 10
-
-        for k in range(NUM_TRIES):
-            r = self.sess.get(self.url)
-            if r.status_code == 200:
-                db_info = r.json()
-                docs = db_info["doc_count"] + db_info["doc_del_count"]
-                if docs == 0:
-                    # db exists and it is empty -- exit condition is met
-                    return
-                self.delete()
-            self.create()
-            time.sleep(k * 0.1)
-        raise Exception(
-            "Failed to recreate the database after {} tries".format(NUM_TRIES)
-        )
+        r = self.sess.get(self.url)
+        if r.status_code == 200:
+            db_info = r.json()
+            docs = db_info["doc_count"] + db_info["doc_del_count"]
+            if docs == 0:
+                # db is not in use, no need to recreate
+                return
+            self.delete()
+        self.create()
+        self.recreate()
 
     def save_doc(self, doc):
         self.save_docs([doc])
@@ -356,8 +348,21 @@ def tearDownClass(klass):
         if clean_up_dbs():
             klass.db.delete()
 
-    def setUp(self):
-        self.db = self.__class__.db
+    def setUp(self, db_per_test=False, partitioned=False):
+        if db_per_test:
+            self.db = Database(random_db_name())
+            self.db.create(q=1, n=1, partitioned=partitioned)
+            self.db_per_test = db_per_test
+        else:
+            self.db = self.__class__.db
+
+    def tearDown(self):
+        if (
+            hasattr(self, "db_per_test")
+            and self.__getattribute__("db_per_test")
+            and clean_up_dbs()
+        ):
+            self.db.delete()
 
 
 class UserDocsTests(DbPerClass):