diff options
Diffstat (limited to 'tests/units/node')
| -rwxr-xr-x | tests/units/node/files.py | 32 | ||||
| -rwxr-xr-x | tests/units/node/model.py | 1 | ||||
| -rwxr-xr-x | tests/units/node/node.py | 3 |
3 files changed, 17 insertions, 19 deletions
diff --git a/tests/units/node/files.py b/tests/units/node/files.py index 111b7a8..cfacc30 100755 --- a/tests/units/node/files.py +++ b/tests/units/node/files.py @@ -26,8 +26,8 @@ class FilesTest(tests.Test): return str(self.uuid) def test_Index_Populate(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) os.utime('files', (1, 1)) assert seeder.sync() @@ -85,8 +85,8 @@ class FilesTest(tests.Test): self.assertEqual(3, seqno.value) def test_Index_SelectiveDiff(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -105,8 +105,8 @@ class FilesTest(tests.Test): sorted(files_diff(seeder, in_seq))) def test_Index_PartialDiff(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -132,8 +132,8 @@ class FilesTest(tests.Test): self.assertRaises(StopIteration, diff.next) def test_Index_diff_Stretch(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -152,8 +152,8 @@ class FilesTest(tests.Test): self.assertRaises(StopIteration, diff.next) def test_Index_diff_DoNotStretchContinuesPacket(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -172,8 +172,8 @@ class FilesTest(tests.Test): self.assertRaises(StopIteration, diff.next) def test_Index_DiffUpdatedFiles(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -223,8 +223,8 @@ class FilesTest(tests.Test): self.assertEqual(6, seqno.value) def test_Index_DiffCreatedFiles(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) @@ -270,8 +270,8 @@ class FilesTest(tests.Test): self.assertEqual(6, seqno.value) def test_Index_DiffDeletedFiles(self): - seqno = toolkit.Seqno('seqno') - seeder = files.Index('files', 'index', seqno) + seqno = toolkit.Seqno(tests.tmpdir + '/seqno') + seeder = files.Index(tests.tmpdir + '/files', tests.tmpdir + '/index', seqno) self.touch(('files/1', '1')) self.touch(('files/2', '2')) diff --git a/tests/units/node/model.py b/tests/units/node/model.py index 795b124..12b5a21 100755 --- a/tests/units/node/model.py +++ b/tests/units/node/model.py @@ -7,7 +7,6 @@ import time from __init__ import tests from sugar_network import db, toolkit -from sugar_network.db import files from sugar_network.client import Connection, keyfile, api_url from sugar_network.model.user import User from sugar_network.model.post import Post diff --git a/tests/units/node/node.py b/tests/units/node/node.py index 2c8ab8a..82d4e43 100755 --- a/tests/units/node/node.py +++ b/tests/units/node/node.py @@ -16,7 +16,6 @@ from os.path import exists, join from __init__ import tests from sugar_network import db, node, model, client -from sugar_network.db import files from sugar_network.client import Connection, keyfile, api_url from sugar_network.toolkit import http, coroutine from sugar_network.toolkit.rrd import Rrd @@ -560,7 +559,7 @@ class NodeTest(tests.Test): 'announce': announce, 'version': [[1], 0], 'requires': {}, - 'bundles': {'*-*': {'blob': str(hash(bundle)), 'unpack_size': len(activity_info) + len(changelog)}}, + 'bundles': {'*-*': {'blob': str(hashlib.sha1(bundle).hexdigest()), 'unpack_size': len(activity_info) + len(changelog)}}, 'command': 'true', 'stability': 'developer', }, |