Tickets/dm 2701

tests/DbStorage_1.cc

@@ -30,6 +30,7 @@
 #include <sys/time.h>
 #include "lsst/daf/persistence/DbStorage.h"
 #include "lsst/daf/persistence/LogicalLocation.h"
+#include "lsst/daf/persistence/DbAuth.h"
 #include "lsst/pex/exceptions.h"
 
 #define BOOST_TEST_MODULE DbStorage_1
@@ -44,6 +45,14 @@ BOOST_AUTO_TEST_SUITE(DbStorageSuite)
 BOOST_AUTO_TEST_CASE(DbStorage) {
     lsst::pex::policy::Policy::Ptr policy(new lsst::pex::policy::Policy);
 
+    //If the user cannot access the test database, exit
+    //without failing
+    dafPersist::DbAuth testAuth;
+    testAuth.setPolicy(policy);
+    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+        return;
+    }
+
     struct timeval tv;
     gettimeofday(&tv, 0); 
     long long testId = tv.tv_sec * 1000000LL + tv.tv_usec;
@@ -136,6 +145,14 @@ BOOST_AUTO_TEST_CASE(DbStorage) {
 BOOST_AUTO_TEST_CASE(DbStorageExprs) {
     lsst::pex::policy::Policy::Ptr policy(new lsst::pex::policy::Policy);
 
+    //If the user cannot access the test database, exit
+    //without failing
+    dafPersist::DbAuth testAuth;
+    testAuth.setPolicy(policy);
+    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+        return;
+    }
+
     // Normally, we would create a DbStorage via
     // Persistence::getRetrieveStorage().  For testing purposes, we create one
     // ourselves.

tests/Persistence_1.cc

@@ -32,6 +32,7 @@ extern "C" {
 #include "lsst/daf/persistence/DbTsvStorage.h"
 #include "lsst/daf/persistence/Formatter.h"
 #include "lsst/daf/persistence/LogicalLocation.h"
+#include "lsst/daf/persistence/DbAuth.h"
 #include "lsst/daf/persistence/Persistence.h"
 
 #define BOOST_TEST_MODULE Persistence_1
@@ -185,6 +186,14 @@ BOOST_AUTO_TEST_CASE(PersistenceTest) {
     // Define a blank Policy.
     lsst::pex::policy::Policy::Ptr policy(new lsst::pex::policy::Policy);
 
+    //If the user cannot access the test database, exit
+    //without failing
+    dafPersist::DbAuth testAuth;
+    testAuth.setPolicy(policy);
+    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+        return;
+    }
+
     // Get a unique id for this test.
     struct timeval tv;
     gettimeofday(&tv, 0);      

tests/Persistence_2.cc

@@ -33,6 +33,7 @@
 #include "lsst/daf/persistence/DbStorage.h"
 #include "lsst/daf/persistence/Formatter.h"
 #include "lsst/daf/persistence/LogicalLocation.h"
+#include "lsst/daf/persistence/DbAuth.h"
 #include "lsst/daf/persistence/Persistence.h"
 
 #define BOOST_TEST_MODULE Persistence_2
@@ -192,6 +193,14 @@ BOOST_AUTO_TEST_CASE(Persistence2Test) {
     // Define a blank Policy.
     lsst::pex::policy::Policy::Ptr policy(new lsst::pex::policy::Policy);
 
+    //If the user cannot access the test database, exit
+    //without failing
+    dafPersist::DbAuth testAuth;
+    testAuth.setPolicy(policy);
+    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+        return;
+    }
+
     // Get a unique id for this test.
     struct timeval tv;
     gettimeofday(&tv, 0);      

tests/Persistence_2.py

@@ -20,10 +20,15 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
+import sys
 import lsst.daf.base as dafBase
 import lsst.daf.persistence as dafPersist
 import lsst.pex.policy as pexPolicy
 
+if not dafPersist.DbAuth.available("lsst10.ncsa.uiuc.edu", "3306"):
+    print "*** WARNING*** Database authenticator unavailable.  Skipping test."
+    sys.exit()
+
 def test1():
     """
     Test PropertySet persistence to database without policy.

tests/SConscript

@@ -3,10 +3,5 @@ from lsst.sconsUtils import scripts
 import os
 
 ignoreList = ["cameraMapper.py", "pickleMapper.py"]
-if not os.path.exists(os.path.join(os.environ['HOME'], ".lsst/db-auth.paf")):
-    ignoreList.extend(["DateTime_1", "DbStorage_1", "DbStorage_1.py", "DbStorage_2.py",
-                       "Persistence_1", "Persistence_2", "Persistence_2.py"])
-    print "WARNING: No fallback database authenticator seen"
-    print "Database tests are being skipped"
 
 scripts.BasicSConscript.tests(ignoreList=ignoreList)

ups/daf_persistence.table

@@ -2,7 +2,7 @@ setupRequired(mysqlclient)
 setupRequired(pex_logging)
 setupRequired(pex_policy)
 
-envAppend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
-envAppend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
+envPrepend(LD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
+envPrepend(DYLD_LIBRARY_PATH, ${PRODUCT_DIR}/lib)
 
-envAppend(PYTHONPATH, ${PRODUCT_DIR}/python)
+envPrepend(PYTHONPATH, ${PRODUCT_DIR}/python)