From 76a6d092dde19df5ae673d16b0b866623f71488f Mon Sep 17 00:00:00 2001 From: Fabien Benureau Date: Sun, 10 Nov 2013 02:43:46 +0100 Subject: [PATCH] fixed bug in datacache + added corresponding tests --- papers/datacache.py | 2 +- tests/test_databroker.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/papers/datacache.py b/papers/datacache.py index 0d75fb3..bb0b97c 100644 --- a/papers/datacache.py +++ b/papers/datacache.py @@ -47,7 +47,7 @@ class DataCache(object): self.databroker.remove(citekey) def exists(self, citekey, both=True): - self.databroker.exists(citekey, both=both) + return self.databroker.exists(citekey, both=both) def citekeys(self): listings = self.listing(filestats=False) diff --git a/tests/test_databroker.py b/tests/test_databroker.py index 8cb6344..255585b 100644 --- a/tests/test_databroker.py +++ b/tests/test_databroker.py @@ -28,12 +28,17 @@ class TestDataBroker(TestFakeFs): page99_metadata = ende.decode_metadata(str_fixtures.metadata_raw0) page99_bibdata = ende.decode_bibdata(str_fixtures.bibyaml_raw0) - dtb = databroker.DataBroker('tmp', create=True) - dtc = datacache.DataCache('tmp') + for db_class in [databroker.DataBroker, datacache.DataCache]: + self.fs = fake_env.create_fake_fs([content, filebroker]) + + db = db_class('tmp', create=True) - for db in [dtb, dtc]: db.push_metadata('citekey1', page99_metadata) + self.assertTrue(db.exists('citekey1', both=False)) + self.assertFalse(db.exists('citekey1', both=True)) + db.push_bibdata('citekey1', page99_bibdata) + self.assertTrue(db.exists('citekey1', both=True)) self.assertEqual(db.pull_metadata('citekey1'), page99_metadata) self.assertEqual(db.pull_bibdata('citekey1'), page99_bibdata)