[CalendarServer-changes] [11327] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 11327
          http://trac.calendarserver.org//changeset/11327
Author:   wsanchez at apple.com
Date:     2013-06-11 10:21:51 -0700 (Tue, 11 Jun 2013)
Log Message:
-----------
Use a different SHARED_DB_PATH per process.

Modified Paths:
--------------
    CalendarServer/trunk/test
    CalendarServer/trunk/txdav/common/datastore/test/util.py

Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test	2013-06-10 21:29:13 UTC (rev 11326)
+++ CalendarServer/trunk/test	2013-06-11 17:21:51 UTC (rev 11327)
@@ -51,7 +51,7 @@
   exit 64;
 }
 
-while getopts "nhoucr:" option; do
+while getopts "nhoucr:j:" option; do
   case "${option}" in
     '?') usage; ;;
     'h') usage -; exit 0; ;;
@@ -61,6 +61,7 @@
     'u') until_fail="--until-failure"; ;;
     'c')   coverage="--coverage"; ;;
     't')  m_twisted="twisted"; ;;
+    'j')    numjobs="-j $OPTARG"; ;;
   esac;
 done;
 shift $((${OPTIND} - 1));
@@ -81,7 +82,7 @@
 find "${wd}" -name \*.pyc -print0 | xargs -0 rm;
 
 mkdir -p "${wd}/data";
-cd "${wd}" && "${python}" "${trial}" --temp-directory="${wd}/data/trial" --rterrors ${random} ${until_fail} ${no_colour} ${coverage} ${test_modules};
+cd "${wd}" && "${python}" "${trial}" --temp-directory="${wd}/data/trial" --rterrors ${random} ${until_fail} ${no_colour} ${coverage} ${numjobs} ${test_modules};
 
 if ${flaky}; then
   echo "";
@@ -123,4 +124,3 @@
     exit 1;
 fi;
 rm -f "${tmp}";
-

Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/util.py	2013-06-10 21:29:13 UTC (rev 11326)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py	2013-06-11 17:21:51 UTC (rev 11327)
@@ -21,6 +21,8 @@
 
 from __future__ import print_function
 
+import os
+
 from zope.interface.declarations import implements
 from txdav.common.idirectoryservice import IStoreDirectoryService, \
     IStoreDirectoryRecord
@@ -134,7 +136,7 @@
     sharedService = None
     currentTestID = None
 
-    SHARED_DB_PATH = "_test_sql_db"
+    SHARED_DB_PATH = "_test_sql_db" + str(os.getpid())
 
 
     @classmethod
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130611/9ed79cc5/attachment-0001.html>