[Zodb-checkins] SVN: ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/test rename an an option

[Patrick Strawderman]

Log message for revision 128035:
  rename an an option
  

Changed:
  U   ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testFileStorage.py
  U   ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testMVCCMappingStorage.py
  U   ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testblob.py

-=-
Modified: ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testFileStorage.py
===================================================================
--- ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testFileStorage.py	2012-10-17 17:27:07 UTC (rev 128034)
+++ ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testFileStorage.py	2012-10-17 19:41:39 UTC (rev 128035)
@@ -676,18 +676,18 @@
         tearDown=zope.testing.setupstack.tearDown))
     suite.addTest(ZODB.tests.testblob.storage_reusable_suite(
         'BlobFileStorage',
-        lambda name, blob_dir, permissions=None:
+        lambda name, blob_dir, blob_dir_permissions=None:
         ZODB.FileStorage.FileStorage('%s.fs' % name, blob_dir=blob_dir,
-            blob_dir_permissions=permissions),
+            blob_dir_permissions=blob_dir_permissions),
         test_blob_storage_recovery=True,
         test_packing=True,
         ))
     suite.addTest(ZODB.tests.testblob.storage_reusable_suite(
         'BlobFileHexStorage',
-        lambda name, blob_dir, permissions=None:
+        lambda name, blob_dir, blob_dir_permissions=None:
         ZODB.tests.hexstorage.HexStorage(
             ZODB.FileStorage.FileStorage('%s.fs' % name, blob_dir=blob_dir,
-                blob_dir_permissions=permissions)),
+                blob_dir_permissions=blob_dir_permissions)),
         test_blob_storage_recovery=True,
         test_packing=True,
         ))

Modified: ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testMVCCMappingStorage.py
===================================================================
--- ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testMVCCMappingStorage.py	2012-10-17 17:27:07 UTC (rev 128034)
+++ ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testMVCCMappingStorage.py	2012-10-17 19:41:39 UTC (rev 128035)
@@ -168,9 +168,9 @@
         self._storage.tpc_begin(t)
         self.assertEqual(self._storage._tid, 'zzzzzzzz')
 
-def create_blob_storage(name, blob_dir, permissions=None):
+def create_blob_storage(name, blob_dir, blob_dir_permissions=None):
     s = MVCCMappingStorage(name)
-    return ZODB.blob.BlobStorage(blob_dir, s, permissions=permissions)
+    return ZODB.blob.BlobStorage(blob_dir, s, permissions=blob_dir_permissions)
 
 def test_suite():
     suite = unittest.makeSuite(MVCCMappingStorageTests, 'check')

Modified: ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testblob.py
===================================================================
--- ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testblob.py	2012-10-17 17:27:07 UTC (rev 128034)
+++ ZODB/branches/patricks-blob-dir-perm/src/ZODB/tests/testblob.py	2012-10-17 19:41:39 UTC (rev 128035)
@@ -450,7 +450,8 @@
 
     Blob dir permissions can also be specified explicitly.
 
-    >>> blob_storage = create_storage(blob_dir="blahbs", permissions=0770)
+    >>> blob_storage = create_storage(blob_dir="blahbs",
+    ...     blob_dir_permissions=0770)
     >>> os.path.isdir("blahbs")
     True
     >>> oct(os.stat("blahbs").st_mode)
@@ -683,11 +684,11 @@
 def setUpBlobAdaptedFileStorage(test):
     setUp(test)
 
-    def create_storage(name='data', blob_dir=None, permissions=None):
+    def create_storage(name='data', blob_dir=None, blob_dir_permissions=None):
         if blob_dir is None:
             blob_dir = '%s.bobs' % name
         return ZODB.blob.BlobStorage(blob_dir, FileStorage('%s.fs' % name),
-            permissions=permissions)
+            blob_dir_permissions=blob_dir_permissions)
 
     test.globs['create_storage'] = create_storage
 
@@ -702,10 +703,12 @@
     """
     def setup(test):
         setUp(test)
-        def create_storage(name='data', blob_dir=None, permissions=None):
+        def create_storage(name='data', blob_dir=None,
+            blob_dir_permissions=None):
             if blob_dir is None:
                 blob_dir = '%s.bobs' % name
-            return factory(name, blob_dir, permissions=permissions)
+            return factory(name, blob_dir,
+                blob_dir_permissions=blob_dir_permissions)
 
         test.globs['create_storage'] = create_storage
 
@@ -729,10 +732,12 @@
             ]),
         ))
 
-    def create_storage(self, name='data', blob_dir=None, permissions=None):
+    def create_storage(self, name='data', blob_dir=None,
+        blob_dir_permissions=None):
         if blob_dir is None:
             blob_dir = '%s.bobs' % name
-        return factory(name, blob_dir, permissions=permissions)
+        return factory(name, blob_dir,
+            blob_dir_permissions=blob_dir_permissions)
 
     def add_test_based_on_test_class(class_):
         new_class = class_.__class__(
@@ -774,9 +779,9 @@
         ))
     suite.addTest(storage_reusable_suite(
         'BlobAdaptedFileStorage',
-        lambda name, blob_dir, permissions=None:
+        lambda name, blob_dir, blob_dir_permissions=None:
         ZODB.blob.BlobStorage(blob_dir, FileStorage('%s.fs' % name),
-            permissions=permissions),
+            permissions=blob_dir_permissions),
         test_blob_storage_recovery=True,
         test_packing=True,
         ))