[Zodb-checkins] SVN: ZODB/branches/ctheune-bushy-directory/src/ZEO/ Make ClientStorage respect the actual temporary directory that is provided by

[Christian Theune]

Log message for revision 87808:
  Make ClientStorage respect the actual temporary directory that is provided by
  the filesystem helper to avoid messing up the actual storage area.
  

Changed:
  U   ZODB/branches/ctheune-bushy-directory/src/ZEO/ClientStorage.py
  U   ZODB/branches/ctheune-bushy-directory/src/ZEO/tests/testZEO.py

-=-
Modified: ZODB/branches/ctheune-bushy-directory/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/branches/ctheune-bushy-directory/src/ZEO/ClientStorage.py	2008-06-26 17:53:57 UTC (rev 87807)
+++ ZODB/branches/ctheune-bushy-directory/src/ZEO/ClientStorage.py	2008-06-26 18:03:20 UTC (rev 87808)
@@ -985,7 +985,7 @@
                 pass
 
     def temporaryDirectory(self):
-        return self.blob_dir
+        return self.fshelper.temp_dir
 
     def tpc_vote(self, txn):
         """Storage API: vote on a transaction."""

Modified: ZODB/branches/ctheune-bushy-directory/src/ZEO/tests/testZEO.py
===================================================================
--- ZODB/branches/ctheune-bushy-directory/src/ZEO/tests/testZEO.py	2008-06-26 17:53:57 UTC (rev 87807)
+++ ZODB/branches/ctheune-bushy-directory/src/ZEO/tests/testZEO.py	2008-06-26 18:03:20 UTC (rev 87808)
@@ -562,7 +562,7 @@
         self.assert_((os.stat(filename).st_mode & stat.S_IREAD))
 
     def checkTemporaryDirectory(self):
-        self.assertEquals(self.blob_cache_dir,
+        self.assertEquals(os.path.join(self.blob_cache_dir, 'tmp'),
                           self._storage.temporaryDirectory())
 
     def checkTransactionBufferCleanup(self):