Skip to content

Commit

Permalink
fix: dev: fixing a multitenacy bug
Browse files Browse the repository at this point in the history
  • Loading branch information
geonexus committed Mar 23, 2015
1 parent 8771ad9 commit d5d65f4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
15 changes: 14 additions & 1 deletion facts/myredis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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


2 changes: 1 addition & 1 deletion server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 4 additions & 5 deletions tests/test_redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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'])
Expand All @@ -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])
Expand Down Expand Up @@ -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)

Expand All @@ -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)

0 comments on commit d5d65f4

Please sign in to comment.