diff options
Diffstat (limited to 'tests/__init__.py')
| -rw-r--r-- | tests/__init__.py | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index 6a997e7..3767614 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -18,7 +18,7 @@ from M2Crypto import DSA from gevent import monkey from sugar_network.toolkit import coroutine, http, mountpoints, Option, gbus, i18n, languages -from sugar_network.toolkit.router import Router, File +from sugar_network.toolkit.router import Router from sugar_network.toolkit.coroutine import this from sugar_network.db import blobs from sugar_network.client import IPCConnection, journal, routes as client_routes @@ -143,7 +143,7 @@ class Test(unittest.TestCase): this.call = None this.broadcast = lambda x: x - self.override_files() + blobs.init('blobs') def tearDown(self): self.stop_nodes() @@ -154,43 +154,6 @@ class Test(unittest.TestCase): setattr(mod, name, old_handler) sys.stdout.flush() - def override_files(self): - os.makedirs('blobs') - self.blobs = {} - - def files_post(content, mime_type=None, digest_to_assert=None): - if hasattr(content, 'read'): - content = content.read() - digest = File.Digest(hash(content)) - if digest_to_assert: - assert digest == digest_to_assert - path = join('blobs', digest) - with file(path, 'w') as f: - f.write(content) - self.blobs[digest] = {'content-type': mime_type or 'application/octet-stream'} - return File(path, digest, self.blobs[digest].items()) - - def files_update(digest, meta): - self.blobs.setdefault(digest, {}).update(meta) - - def files_get(digest): - if digest not in self.blobs: - return None - path = join('blobs', digest) - return File(path, digest, self.blobs[digest].items()) - - def files_delete(digest): - path = join('blobs', digest) - if exists(path): - os.unlink(path) - if digest in self.blobs: - del self.blobs[digest] - - self.override(blobs, 'post', files_post) - self.override(blobs, 'update', files_update) - self.override(blobs, 'get', files_get) - self.override(blobs, 'delete', files_delete) - def stop_nodes(self): if self.client is not None: self.client.close() |