[Zope-Checkins] CVS: Zope/lib/python/Products/TemporaryFolder/tests - testTemporaryStorage.py:1.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/TemporaryFolder/tests
In directory cvs.zope.org:/tmp/cvs-serv17968/tests

Modified Files:
	testTemporaryStorage.py 
Log Message:
Made rudimentary conflict resolution work in TemporaryStorage reliably

=== Zope/lib/python/Products/TemporaryFolder/tests/testTemporaryStorage.py 1.1 => 1.2 ===
 class TemporaryStorageTests(
     StorageTestBase.StorageTestBase,
+    RevisionStorage.RevisionStorage, # not actually a revision storage, but..
     BasicStorage.BasicStorage,
     Synchronization.SynchronizedStorage,
-    #ConflictResolution.ConflictResolvingStorage,
-    #RevisionStorage.RevisionStorage
+    ConflictResolution.ConflictResolvingStorage,
     ):
 
     def open(self, **kwargs):
@@ -37,7 +37,7 @@
 
 def main():
     alltests=test_suite()
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner(verbosity=9)
     runner.run(alltests)
 
 def debug():