From d5d65f4c4e33274c4f04692c861520087c9a0847 Mon Sep 17 00:00:00 2001 From: Guillermo Jimenez Prieto Date: Mon, 23 Mar 2015 18:29:03 +0100 Subject: [PATCH] fix: dev: fixing a multitenacy bug --- facts/myredis.py | 15 ++++++++++++++- server.py | 2 +- tests/test_redis.py | 9 ++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/facts/myredis.py b/facts/myredis.py index 7997d61..453006e 100644 --- a/facts/myredis.py +++ b/facts/myredis.py @@ -66,7 +66,7 @@ def insert(self, tenantid, serverid, data): is no list or the number of element is not equal to 4. """ ''' we need to check that data is a list and the exact number of - element is equal to 3 - Magic Number + element is equal to 4 - Magic Number ''' if isinstance(data, list) and len(data) == 4: self.r.rpush(tenantid + "." + serverid, data) @@ -112,3 +112,16 @@ def delete(self): """ Delete a especific queue from the redis system. """ self.r.delete(nqueue) + + def check_time_stamps(self, lista): + """ + Check if the list is valid checking last item time-stamp with the new item time-stamp + :param lista: Checks if + :return: + """ + #mediaresponse = mediaMOVIl x Windowsize + #if (tmax)- t(min) > mediaresponse + #clearlist() + #addItem2list + + diff --git a/server.py b/server.py index 95f7fdb..f830a49 100644 --- a/server.py +++ b/server.py @@ -163,7 +163,7 @@ def process_request(request, tenantid, serverid): data.insert(3, datetime.datetime.today().isoformat()) # Check data coherency of time stamps - mredis.check_time_stamps() + # mredis.check_time_stamps() # Insert the result into the queue system mredis.insert(tenantid, serverid, data) diff --git a/tests/test_redis.py b/tests/test_redis.py index d04246d..ba34776 100644 --- a/tests/test_redis.py +++ b/tests/test_redis.py @@ -121,7 +121,7 @@ def testSumListValue(self): of values""" p = myredis() - expected = ["''''''''", 4, 8, '3'] + expected = ["''", 4, 8, '3'] p.insert(serverid, tenantid, [serverid, 1, 2, 3]) p.insert(serverid, tenantid, [serverid, 1, 2, 3]) @@ -139,7 +139,7 @@ def testSumListValue2(self): 5 values of the list of values""" p = myredis() - expected = ["''''''''''", 1111100, 2222200, '3000000'] + expected = ["''", 1111100, 2222200, '3000000'] p.insert(serverid, tenantid, [serverid, 1, 2, '4']) p.insert(serverid, tenantid, [serverid, 10, 20, '40']) @@ -161,7 +161,7 @@ def testMediaListof4Values(self): """ p = myredis() - expected = ["''''''''''", 6, 7, '14'] + expected = ["''", 6, 7, '14'] p.insert(serverid, tenantid, [serverid, 0, 1, 2]) p.insert(serverid, tenantid, [serverid, 3, 4, 5]) @@ -198,7 +198,7 @@ def testRealData2(self): p1 = "[, 1.0, 0.14, '2014-03-29T19:18:25.784424']" - expected = ["''''''''''", 1.0, 0.14, '2014-03-29T19:18:25.784424'] + expected = ["''", 1.0, 0.14, '2014-03-29T19:18:25.784424'] p2 = mylist.parselist(p1) @@ -208,7 +208,6 @@ def testRealData2(self): p.insert(serverid, tenantid, p2) p.insert(serverid, tenantid, p2) - result = p.media(p.range(serverid, tenantid)) self.assertEqual(expected, result.data)