diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_freeze.py | 17 | ||||
| -rw-r--r-- | tests/test_massops.py | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/tests/test_freeze.py b/tests/test_freeze.py index 8ebc02e..fd97a3d 100644 --- a/tests/test_freeze.py +++ b/tests/test_freeze.py @@ -2,6 +2,7 @@ """Test the freeze/thaw feature.""" import os +import shutil import unittest from test_massops import MassOpsTestCase @@ -14,14 +15,24 @@ class FreezeThawTestCase(MassOpsTestCase): # TODO: test queuing - def _test_freeze_thaw(self): + def _test_freeze_thaw_migration(self): """Issue freeze(), force a migration and run thaw().""" self._datastore.freeze(timeout=_DBUS_TIMEOUT_MAX) os.remove(os.environ['HOME']+'/.sugar/default/datastore/version') self._datastore.thaw(timeout=_DBUS_TIMEOUT_MAX) - test_a_freeze_thaw = _test_freeze_thaw - test_y_freeze_thaw = _test_freeze_thaw + def _test_freeze_thaw_reindex(self): + """Issue freeze(), force an index rebuild and run thaw().""" + self._datastore.freeze(timeout=_DBUS_TIMEOUT_MAX) + shutil.rmtree(os.environ['HOME']+'/.sugar/default/datastore/index') + os.remove(os.environ['HOME']+'/.sugar/default/datastore/index_updated') + self._datastore.thaw(timeout=_DBUS_TIMEOUT_MAX) + + test_a_freeze_thaw = _test_freeze_thaw_reindex + test_y10_freeze_thaw = _test_freeze_thaw_reindex + test_y11_update_verify = MassOpsTestCase.test_update_verify + test_y20_freeze_thaw = _test_freeze_thaw_migration + test_y21_update_verify = MassOpsTestCase.test_update_verify def suite(): diff --git a/tests/test_massops.py b/tests/test_massops.py index ac524cf..8082aa6 100644 --- a/tests/test_massops.py +++ b/tests/test_massops.py @@ -143,7 +143,9 @@ class MassOpsTestCase(unittest.TestCase): def test_update_verify(self): """Verify test_update() has changed content and metadata of all entries.""" - for entry in self._datastore.find({}, [], byte_arrays=True)[0]: + entries, total_count = self._datastore.find({}, [], byte_arrays=True) + self.assertEquals(total_count, NUM_RUNS) + for entry in entries: filename = self._datastore.get_filename(entry['uid'], byte_arrays=True) self._filter_properties(entry) |