diff -r 2537df9fdd27 -r ed62ba97d79e dataimport/test/test_massive_store.py
--- a/dataimport/test/test_massive_store.py	Wed Oct 21 16:58:30 2015 +0200
+++ b/dataimport/test/test_massive_store.py	Wed Nov 04 09:11:10 2015 +0100
@@ -90,7 +90,7 @@
             store.prepare_insert_entity('Location', name=u'toto')
             store.flush()
             store.commit()
-            store.cleanup()
+            store.finish()
             cnx.commit()
         with self.admin_access.repo_cnx() as cnx:
             crs = cnx.system_sql('SELECT * FROM entities WHERE type=%(t)s',
@@ -114,7 +114,7 @@
 #            crs = cnx.system_sql('SELECT * FROM entities WHERE type=%(t)s',
 #                                 {'t': 'Location'})
 #            self.assertEqual(len(crs.fetchall()), 1)
-#            store.cleanup()
+#            store.finish()
 
     def test_massimport_etype_metadata(self):
         with self.admin_access.repo_cnx() as cnx:
@@ -154,7 +154,7 @@
     def test_drop_index_recreation(self):
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx, drop_index=True)
-            store.cleanup()
+            store.finish()
             cnx.commit()
         with self.admin_access.repo_cnx() as cnx:
             crs = cnx.system_sql('SELECT indexname FROM pg_indexes')
@@ -222,7 +222,7 @@
             master_store = MassiveObjectStore(cnx, slave_mode=False)
             slave_store = MassiveObjectStore(cnx, slave_mode=True)
             self.assertRaises(RuntimeError, slave_store.flush_meta_data)
-            self.assertRaises(RuntimeError, slave_store.cleanup)
+            self.assertRaises(RuntimeError, slave_store.finish)
 
     def test_simple_insert(self):
         with self.admin_access.repo_cnx() as cnx:
@@ -250,7 +250,7 @@
             self.assertNotIn('owned_by_relation_to_idx', indexes)
 
             # Cleanup -> index
-            store.cleanup()
+            store.finish()
 
             # Check index again
             crs = cnx.system_sql('SELECT indexname FROM pg_indexes')
@@ -278,52 +278,52 @@
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx)
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
             store = MassiveObjectStore(cnx)
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
 
     def test_multiple_insert_relation(self):
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx)
             store.init_relation_table('used_language')
-            store.cleanup()
+            store.finish()
             store = MassiveObjectStore(cnx)
             store.init_relation_table('used_language')
-            store.cleanup()
+            store.finish()
 
     def test_multiple_insert_drop_index(self):
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx, drop_index=False)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
             store = MassiveObjectStore(cnx)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
 
     def test_multiple_insert_drop_index_2(self):
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
             store = MassiveObjectStore(cnx, drop_index=False)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
 
     def test_multiple_insert_drop_index_3(self):
         with self.admin_access.repo_cnx() as cnx:
             store = MassiveObjectStore(cnx, drop_index=False)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
             store = MassiveObjectStore(cnx, drop_index=False)
             store.init_relation_table('used_language')
             store.init_etype_table('TestLocation')
-            store.cleanup()
+            store.finish()
 
 
 if __name__ == '__main__':