Test code was not testing the loop that retries otk database updates

if there is an OS busy error. Hopefully this change will simulate the
case where there is a pre-existing otks database and the roundup
instance opens the existing otk database rather than opening one that
it created.

Author: rouilj

test/rest_common.py

@@ -16,6 +16,9 @@
 from roundup.anypy.strings import b2s, s2b
 import random
 
+from roundup.backends.sessions_dbm import OneTimeKeys
+from roundup.anypy.dbm_ import anydbm, whichdb
+
 from .db_test_base import setupTracker
 
 from .mocknull import MockNull
@@ -39,6 +42,14 @@ def setUp(self):
         # open the database
         self.db = self.instance.open('admin')
 
+        # Create the Otk db.
+        # This allows a test later on to open the existing db and
+        # set a class attribute to test the open retry loop
+        # just as though this process was using a pre-existing db
+        # rather then the new one we create.
+        otk = OneTimeKeys(self.db)
+        otk.set('key', key="value")
+
         # Get user id (user4 maybe). Used later to get data from db.
         self.joeid = self.db.user.create(
             username='joe',
@@ -629,6 +640,12 @@ def testRestRateLimit(self):
         self.db.config['WEB_API_CALLS_PER_INTERVAL'] = 20
         self.db.config['WEB_API_INTERVAL_IN_SEC'] = 60
 
+        # Otk code never passes through the
+        # retry loop. Not sure why but I can force it
+        # through the loop by setting the internal _db_type
+        # setting once the db is created by the previous command.
+        self.db.Otk._db_type = whichdb("%s/%s"%(self.db.Otk.dir, self.db.Otk.name))
+        
         print("Now realtime start:", datetime.utcnow())
         # don't set an accept header; json should be the default
         # use up all our allowed api calls