Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <silbe@activitycentral.com>2011-03-06 13:23:36 (GMT)
committer Sascha Silbe <silbe@activitycentral.com>2011-03-06 13:23:36 (GMT)
commit0d2d02c29ccacedec8b778532bce907ece59482e (patch)
tree25c03f6574de0158562043138f1c4cb38286f452
parent3189ce89e7519e23818d18b6f17623f183d9a14c (diff)
fix incorrect merge
-rw-r--r--tests/test_migration_v2_v3.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_migration_v2_v3.py b/tests/test_migration_v2_v3.py
index 1c57016..a6bf91e 100644
--- a/tests/test_migration_v2_v3.py
+++ b/tests/test_migration_v2_v3.py
@@ -129,7 +129,7 @@ class MigrationV2V3TestCase(unittest.TestCase):
def test_find_all(self):
"""Run find() to list all migrated entries."""
- entries_, count = self._datastore.find({}, {'metadata': ['tree_id']},
+ entries, count = self._datastore.find({}, {'metadata': ['tree_id']},
byte_arrays=True)
self.assertEquals(count, len(self._templates))
self.assertEquals(count, len(entries))