diff test/session_common.py @ 6814:3f60a71b0812

Summary: Support selecion session/otk data store. Add redis as data store. Allow admin to select the backend data store. Compatibility matrix: main\/ session>| anydbm | sqlite | redis | mysql | postgresql | anydbm | D | | X | | | sqlite | X | D | X | | | mysql | | | | D | | postgresql | | | | | D | --------------------------------------------------------------+ D - default if unconfigured, X - compatible choice DETAILS roundup/configuration.py: add config.ini section sessiondb with settings: backend and redis_url. CHANGES.txt, doc/admin_guide.txt, doc/installation.txt, doc/upgrading.txt: doc on config of session db and redis. Plus some other fixes: admin - clarified why we do not drop __words and __testids table in native-fts conversion. TYpo fix. upgrading - doc how you can keep using anydbm for session data with sqlite. Fix dupe sentence in an upgrading config.ini section. roundup/backends/back_anydbm.py, roundup/backends/back_sqlite.py: code to support redis, redis/anydbm backends respectively. roundup/backends/sessions_redis.py new storage backend for redis. roundup/rest.py, roundup/cgi/actions.py, roundup/cgi/templating.py redis uses a different way of calculating lifetime/timestamp. Since expiration of an item occurred if its timestamp was more than 1 week old, code would calculate: now - 1 week + lifetime. But this results in faster expiration in redis if used for lifetime/timestamp. Convert code to use the lifetime() method in BasicDatabase that generates the right timestamp for each backend. test/session_common.py: added tests for more cases, get without default, getall non-existing key etc. timestamp test changed to use new self.get_ts which is overridden in other tests. Test that datatypes survive storage. test/test_redis_session.py: test redis session store with sqlite and anydbm primary databases test/test_anydbm.py, test/test_sqlite.py add test to make sure the databases are properly set up sqlite - add test cases where anydbm is used as datastore anydbm - remove updateTimestamp override add get_ts(). test/test_config.py tests on redis_url and compatibility on choice of sessiondb backend .travis.yml: add redis db and redis-py
author John Rouillard <rouilj@ieee.org>
date Thu, 04 Aug 2022 14:41:58 -0400
parents 375d40a9e730
children fe0091279f50
line wrap: on
line diff
--- a/test/session_common.py	Wed Aug 03 17:34:58 2022 -0400
+++ b/test/session_common.py	Thu Aug 04 14:41:58 2022 -0400
@@ -54,11 +54,17 @@
         self.assertEqual(self.sessions.list().sort(),
                 [self.s2b('random_key'), self.s2b('random_key2')].sort())
 
-    def testGetMissingKey(self):
-        self.sessions.set('random_key', text='hello, world!', otherval='bar')
+    def testGetGetAllMissingKey(self):
+        self.assertEqual(self.sessions.get('badc_key',
+                                          'text', 'default_val'),
+                         'default_val')
+
         with self.assertRaises(KeyError) as e:
             self.sessions.get('badc_key', 'text')
 
+        with self.assertRaises(KeyError) as e:
+            self.sessions.getall('badc_key')
+
     def testGetAll(self):
         self.sessions.set('random_key', text='hello, world!', otherval='bar')
         self.assertEqual(self.sessions.getall('random_key'),
@@ -121,19 +127,10 @@
         self.assertEqual(item, 'hello, world2!')
         self.assertAlmostEqual(ts, item_ts, 2)
 
-    # overridden in dbm and memory backends
+    # overridden in test_memory
     def testUpdateTimestamp(self):
-        def get_ts_via_sql(self):
-            sql = '''select %(name)s_time from %(name)ss
-                 where %(name)s_key = '%(session)s';'''% \
-                     {'name': self.sessions.name,
-                      'session': 'random_session'}
-
-            self.sessions.cursor.execute(sql)
-            db_tstamp = self.sessions.cursor.fetchone()
-            return db_tstamp
-
-        # make sure timestamp is older than one minute so update will apply
+        # make sure timestamp is older than one minute so update
+        # will apply
         timestamp = time.time() - 62
         self.sessions.set('random_session', text='hello, world!',
                           __timestamp=timestamp)
@@ -148,8 +145,40 @@
         #                                       '__timestamp'),
         #                     timestamp)
 
-        # use 61 to allow a fudge factor
-        self.assertGreater(get_ts_via_sql(self)[0] - timestamp, 61)
+        # use 61 to allow a 1 second delay in test
+        self.assertGreater(self.get_ts()[0] - timestamp, 61)
+
+    # overridden in test_anydbm
+    def get_ts(self, key="random_session"):
+        sql = '''select %(name)s_time from %(name)ss
+        where %(name)s_key = '%(session)s';'''% \
+            {'name': self.sessions.name,
+             'session': key}
+
+        self.sessions.cursor.execute(sql)
+        db_tstamp = self.sessions.cursor.fetchone()
+        return db_tstamp
+
+    def testDataTypes(self):
+        """make sure all data survives a round trip through the
+           session database including data types.
+
+           Found this was a problem when trying to store the
+           data using a redis hash that has no native data types
+           for booleans and numbers get returned by redis module
+           as strings.
+        """
+        in_data = {"text": 'hello, world!',
+                   "integer": 56, 
+                   "float": 3.1425,
+                   "list": [ 1, "Two", 3.0, "Four" ],
+                   "boolean": True,
+                   "tuple": ("f", 4),
+                   }
+
+        self.sessions.set('random_data', **in_data)
+        out_data = self.sessions.getall('random_data')
+        self.assertEqual(in_data, out_data)
 
     def testLifetime(self):
         ts = self.sessions.lifetime(300)

Roundup Issue Tracker: http://roundup-tracker.org/