diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2011-01-19 17:57:24 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2011-01-19 17:57:24 (GMT) |
| commit | be1f2707c8e2fe02dff3b0c43483e1aa8b473f65 (patch) | |
| tree | c5bf0c1a94f301a23b1209bfb5ed44478b083b9c | |
| parent | 2f9d021045805ee1cba12bf117de6579ce1587de (diff) | |
adjust to new filesize and creation_time properties
| -rw-r--r-- | tests/basic_api_v2.txt | 5 | ||||
| -rw-r--r-- | tests/test_massops.py | 5 | ||||
| -rw-r--r-- | tests/test_migration_v1_v2.py | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/basic_api_v2.txt b/tests/basic_api_v2.txt index d9a38ac..b56e629 100644 --- a/tests/basic_api_v2.txt +++ b/tests/basic_api_v2.txt @@ -66,9 +66,8 @@ Change some entries: Retrieve metadata for a single entry, ignoring variable data: >>> d=dict(ds.get_properties(o3_uid, byte_arrays=True)) ->>> del d['uid'], d['timestamp'] ->>> d -{dbus.String(u'title'): dbus.ByteArray('DS test object 2', variant_level=1), dbus.String(u'mime_type'): dbus.ByteArray('text/html', variant_level=1), dbus.String(u'activity'): dbus.ByteArray('org.sugarlabs.DataStoreTest3', variant_level=1)} +>>> del d['uid'], d['timestamp'], d['creation_time'] +>>> assert to_native(d) == {u'title': 'DS test object 2', u'mime_type': 'text/html', u'activity': 'org.sugarlabs.DataStoreTest3'} Find entries using "known" metadata: diff --git a/tests/test_massops.py b/tests/test_massops.py index ddc5242..8638bc1 100644 --- a/tests/test_massops.py +++ b/tests/test_massops.py @@ -15,6 +15,7 @@ DS_DBUS_PATH = "/org/laptop/sugar/DataStore" NUM_RUNS = int(os.environ.get('MASSOPS_RUNS', '100')) IGNORE_PROPERTIES = [ 'checksum', + 'creation_time', 'number', 'timestamp', 'uid', @@ -112,6 +113,8 @@ class MassOpsTestCase(unittest.TestCase): for entry in self._datastore.find({}, ['uid'], byte_arrays=True)[0]: properties = self._datastore.get_properties(entry['uid'], byte_arrays=True) + self.assertEquals(properties.pop('filesize'), + str(len(self._create_content))) self._filter_properties(properties) self.assertEquals(properties, self._create_properties) @@ -146,6 +149,8 @@ class MassOpsTestCase(unittest.TestCase): for entry in self._datastore.find({}, [], byte_arrays=True)[0]: filename = self._datastore.get_filename(entry['uid'], byte_arrays=True) + self.assertEquals(entry.pop('filesize'), + str(len(self._update_content))) self._filter_properties(entry) try: self.assertEquals(entry, self._update_properties) diff --git a/tests/test_migration_v1_v2.py b/tests/test_migration_v1_v2.py index 82c4cac..fd7010d 100644 --- a/tests/test_migration_v1_v2.py +++ b/tests/test_migration_v1_v2.py @@ -17,6 +17,7 @@ DS_DBUS_PATH = "/org/laptop/sugar/DataStore" IGNORE_PROPERTIES = [ 'activity_id', 'checksum', + 'creation_time', 'ctime', 'mtime', 'number', @@ -136,6 +137,8 @@ class MigrationV1V2TestCase(unittest.TestCase): number = int(properties['number']) expected = self._fill_template(self._templates[number], number) + self.assertEquals(properties.pop('filesize'), + str(len(self._v1_content(number)))) self._filter_properties(properties) self._filter_properties(expected) self.assertEquals(properties, expected) |