svn commit: r383437 - in /httpd/mod_python/trunk: Doc/appendixc.tex test/test.py

[jg...@apache.org]

Author: jgallacher
Date: Sun Mar  5 16:04:27 2006
New Revision: 383437

URL: http://svn.apache.org/viewcvs?rev=383437&view=rev
Log:
Fixed DbmSession unit test to not use the default location for the
dbm file. (MODPYTHON-119)

Modified:
    httpd/mod_python/trunk/Doc/appendixc.tex
    httpd/mod_python/trunk/test/test.py

Modified: httpd/mod_python/trunk/Doc/appendixc.tex
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/Doc/appendixc.tex?rev=383437&r1=383436&r2=383437&view=diff
==============================================================================
--- httpd/mod_python/trunk/Doc/appendixc.tex (original)
+++ httpd/mod_python/trunk/Doc/appendixc.tex Sun Mar  5 16:04:27 2006
@@ -61,6 +61,10 @@
       The \code{req.proxyreq} and \code{req.uri} attributes are now writable.
       This allows a handler to setup these values and trigger proxying of the
       current request to a remote server.
+    \item
+      (\citetitle[http://issues.apache.org/jira/browse/MODPYTHON-119]{MODPYTHON-119})
+      DbmSession unit test no longer uses the default directory for the dbm file,
+      so the test will not interfer with the user's current apache instance.
   \end{itemize}
 
   Bug Fixes

Modified: httpd/mod_python/trunk/test/test.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/test/test.py?rev=383437&r1=383436&r2=383437&view=diff
==============================================================================
--- httpd/mod_python/trunk/test/test.py (original)
+++ httpd/mod_python/trunk/test/test.py Sun Mar  5 16:04:27 2006
@@ -179,6 +179,7 @@
 SERVER_ROOT = TESTHOME
 CONFIG = os.path.join(TESTHOME, "conf", "test.conf")
 DOCUMENT_ROOT = os.path.join(TESTHOME, "htdocs")
+TMP_DIR = os.path.join(TESTHOME, "tmp")
 PORT = 0 # this is set in fundUnusedPort()
  
     
@@ -260,6 +261,12 @@
             shutil.rmtree(logs)
         os.mkdir(logs)
 
+        # place
+        if os.path.exists(TMP_DIR):
+            shutil.rmtree(TMP_DIR)
+        os.mkdir(TMP_DIR)
+
+
     def makeConfig(self, append=""):
 
         # create config files, etc
@@ -1814,6 +1821,7 @@
                         Directory(DOCUMENT_ROOT,
                                   SetHandler("mod_python"),
                                   PythonHandler("tests::Session_Session"),
+                                  PythonOption('session_directory "%s"' % TMP_DIR),
                                   PythonDebug("On")))
         return str(c)
 
@@ -1852,6 +1860,7 @@
                         Directory(DOCUMENT_ROOT,
                                   SetHandler("mod_python"),
                                   PythonHandler("tests::Session_Session"),
+                                  PythonOption('session_directory "%s"' % TMP_DIR),
                                   PythonDebug("On")))
         return str(c)