diff options
Diffstat (limited to 'tests/units/node')
-rwxr-xr-x | tests/units/node/node.py | 35 | ||||
-rwxr-xr-x | tests/units/node/stats_node.py | 5 | ||||
-rwxr-xr-x | tests/units/node/volume.py | 3 |
3 files changed, 33 insertions, 10 deletions
diff --git a/tests/units/node/node.py b/tests/units/node/node.py index 586fbd6..b5abe78 100755 --- a/tests/units/node/node.py +++ b/tests/units/node/node.py @@ -6,6 +6,7 @@ import os import time import json import base64 +import shutil import hashlib from M2Crypto import RSA from email.utils import formatdate, parsedate @@ -106,11 +107,11 @@ class NodeTest(tests.Test): def test_NodeStats(self): stats_node.stats_node.value = True - stats_node.stats_node_step.value = 1 + stats_node.stats_node_rras.value = ['RRA:AVERAGE:0.5:1:60', 'RRA:AVERAGE:0.5:3:60'] rrd = Rrd('stats/node', stats_node.stats_node_step.value, stats_node.stats_node_rras.value) ts = int(time.time()) / 3 * 3 - for i in range(100): + for i in range(10): rrd['user'].put({'total': i}, ts + i) volume = db.Volume('db', model.RESOURCES) @@ -131,10 +132,36 @@ class NodeTest(tests.Test): (ts + 3, {'total': 2.0}), (ts + 6, {'total': 5.0}), (ts + 9, {'total': 8.0}), - (ts + 12, {'total': 11.0}), ], }, - call(cp, method='GET', cmd='stats', source='user.total', start=ts, end=ts + 12, records=4)) + call(cp, method='GET', cmd='stats', source='user.total', start=ts, end=ts + 9, records=3)) + + def test_NodeStatsDefaults(self): + stats_node.stats_node.value = True + rrd = Rrd('stats/node', stats_node.stats_node_step.value, stats_node.stats_node_rras.value) + + ts = int(time.time()) + for i in range(10): + rrd['user'].put({'total': i}, ts + i) + + volume = db.Volume('db', model.RESOURCES) + cp = NodeRoutes('guid', volume) + + self.assertEqual({ + 'user': [ + (ts + 0, {'total': 0.0}), + (ts + 1, {'total': 1.0}), + (ts + 2, {'total': 2.0}), + (ts + 3, {'total': 3.0}), + (ts + 4, {'total': 4.0}), + (ts + 5, {'total': 5.0}), + (ts + 6, {'total': 6.0}), + (ts + 7, {'total': 7.0}), + (ts + 8, {'total': 8.0}), + (ts + 9, {'total': 9.0}), + ], + }, + call(cp, method='GET', cmd='stats', source='user.total')) def test_HandleDeletes(self): volume = db.Volume('db', model.RESOURCES) diff --git a/tests/units/node/stats_node.py b/tests/units/node/stats_node.py index 60e7d96..a0ae5d0 100755 --- a/tests/units/node/stats_node.py +++ b/tests/units/node/stats_node.py @@ -6,7 +6,7 @@ import time from __init__ import tests from sugar_network import db, model -from sugar_network.node.stats_node import stats_node_step, Sniffer +from sugar_network.node.stats_node import Sniffer from sugar_network.toolkit.rrd import Rrd from sugar_network.toolkit.router import Request @@ -194,7 +194,6 @@ class StatsTest(tests.Test): self.assertEqual(1, stats._stats['artifact'].downloaded) def test_Commit(self): - stats_node_step.value = 1 volume = db.Volume('local', model.RESOURCES) volume['user'].create({'guid': 'user', 'name': 'user', 'color': '', 'pubkey': ''}) volume['context'].create({'guid': 'context', 'type': 'activity', 'title': '', 'summary': '', 'description': ''}) @@ -273,7 +272,6 @@ class StatsTest(tests.Test): [[(j.name,) + i for i in j.get(j.last, j.last)] for j in Rrd('stats/node', 1)]) def test_CommitContextStats(self): - stats_node_step.value = 1 volume = db.Volume('local', model.RESOURCES) volume['context'].create({'guid': 'context', 'type': 'activity', 'title': '', 'summary': '', 'description': ''}) @@ -323,7 +321,6 @@ class StatsTest(tests.Test): self.assertEqual(3, volume['context'].get('context')['rating']) def test_CommitArtifactStats(self): - stats_node_step.value = 1 volume = db.Volume('local', model.RESOURCES) volume['context'].create({'guid': 'context', 'type': 'activity', 'title': '', 'summary': '', 'description': ''}) diff --git a/tests/units/node/volume.py b/tests/units/node/volume.py index 8bd10df..40e052b 100755 --- a/tests/units/node/volume.py +++ b/tests/units/node/volume.py @@ -11,7 +11,7 @@ from __init__ import tests from sugar_network import db, toolkit, model from sugar_network.node.volume import diff, merge -from sugar_network.node.stats_node import stats_node_step, Sniffer +from sugar_network.node.stats_node import Sniffer from sugar_network.node.routes import NodeRoutes from sugar_network.toolkit.rrd import Rrd from sugar_network.toolkit.router import Router, Request, Response, fallbackroute, Blob, ACL, route @@ -349,7 +349,6 @@ class VolumeTest(tests.Test): assert volume['document'].exists('1') def test_merge_UpdateStats(self): - stats_node_step.value = 1 volume = db.Volume('db', model.RESOURCES) cp = NodeRoutes('guid', volume) stats = Sniffer(volume) |