Use the modern test server address lsst-db.ncsa.illinois.edu

lsst-dm · Sep 2, 2016 · 215bd7c · 215bd7c
1 parent e6890fd
commit 215bd7c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 27 deletions.
diff --git a/tests/DbAuth.py b/tests/DbAuth.py
@@ -46,26 +46,26 @@ def tearDown(self):
         del self.pol
 
     def testSetPolicy(self):
-        self.assertTrue(DbAuth.available("lsst10.ncsa.uiuc.edu", "3306"))
-        self.assertEqual(DbAuth.authString("lsst10.ncsa.uiuc.edu", "3306"),
+        self.assertTrue(DbAuth.available("lsst-db.ncsa.illinois.edu", "3306"))
+        self.assertEqual(DbAuth.authString("lsst-db.ncsa.illinois.edu", "3306"),
                          "test:globular.test")
-        self.assertEqual(DbAuth.username("lsst10.ncsa.uiuc.edu", "3306"),
+        self.assertEqual(DbAuth.username("lsst-db.ncsa.illinois.edu", "3306"),
                          "test")
-        self.assertEqual(DbAuth.password("lsst10.ncsa.uiuc.edu", "3306"),
+        self.assertEqual(DbAuth.password("lsst-db.ncsa.illinois.edu", "3306"),
                          "globular.test")
-        self.assertTrue(DbAuth.available("lsst10.ncsa.uiuc.edu", "3307"))
-        self.assertEqual(DbAuth.authString("lsst10.ncsa.uiuc.edu", "3307"),
+        self.assertTrue(DbAuth.available("lsst-db.ncsa.illinois.edu", "3307"))
+        self.assertEqual(DbAuth.authString("lsst-db.ncsa.illinois.edu", "3307"),
                          "boris:natasha")
-        self.assertEqual(DbAuth.username("lsst10.ncsa.uiuc.edu", "3307"),
+        self.assertEqual(DbAuth.username("lsst-db.ncsa.illinois.edu", "3307"),
                          "boris")
-        self.assertEqual(DbAuth.password("lsst10.ncsa.uiuc.edu", "3307"),
+        self.assertEqual(DbAuth.password("lsst-db.ncsa.illinois.edu", "3307"),
                          "natasha")
-        self.assertTrue(DbAuth.available("lsst9.ncsa.uiuc.edu", "3306"))
-        self.assertEqual(DbAuth.authString("lsst9.ncsa.uiuc.edu", "3306"),
+        self.assertTrue(DbAuth.available("lsst9.ncsa.illinois.edu", "3306"))
+        self.assertEqual(DbAuth.authString("lsst9.ncsa.illinois.edu", "3306"),
                          "rocky:squirrel")
-        self.assertEqual(DbAuth.username("lsst9.ncsa.uiuc.edu", "3306"),
+        self.assertEqual(DbAuth.username("lsst9.ncsa.illinois.edu", "3306"),
                          "rocky")
-        self.assertEqual(DbAuth.password("lsst9.ncsa.uiuc.edu", "3306"),
+        self.assertEqual(DbAuth.password("lsst9.ncsa.illinois.edu", "3306"),
                          "squirrel")
 
 

diff --git a/tests/DbStorage_1.cc b/tests/DbStorage_1.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(DbStorage) {
     //without failing
     dafPersist::DbAuth testAuth;
     testAuth.setPolicy(policy);
-    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+    if(!testAuth.available("lsst-db.ncsa.illinois.edu","3306")){
         return;
     }
 
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(DbStorage) {
     dafPersist::DbStorage dbs;
 
     dbs.setPolicy(policy);
-    dafPersist::LogicalLocation loc("mysql://lsst10.ncsa.uiuc.edu:3306/test");
+    dafPersist::LogicalLocation loc("mysql://lsst-db.ncsa.illinois.edu:3306/test");
     dbs.setPersistLocation(loc);
 
     dbs.startTransaction();
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(DbStorageExprs) {
     //without failing
     dafPersist::DbAuth testAuth;
     testAuth.setPolicy(policy);
-    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+    if(!testAuth.available("lsst-db.ncsa.illinois.edu","3306")){
         return;
     }
 
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(DbStorageExprs) {
     dafPersist::DbStorage dbs;
 
     dbs.setPolicy(policy);
-    dafPersist::LogicalLocation loc("mysql://lsst10.ncsa.uiuc.edu:3306/test");
+    dafPersist::LogicalLocation loc("mysql://lsst-db.ncsa.illinois.edu:3306/test");
     dbs.setRetrieveLocation(loc);
 
     dbs.startTransaction();

diff --git a/tests/DbStorage_1.py b/tests/DbStorage_1.py
@@ -30,7 +30,7 @@
 import lsst.daf.persistence as dafPers
 import lsst.pex.policy
 
-HOST = "lsst10.ncsa.uiuc.edu"
+HOST = "lsst-db.ncsa.illinois.edu"
 PORT = "3306"
 
 

diff --git a/tests/DbStorage_2.py b/tests/DbStorage_2.py
@@ -31,7 +31,7 @@
 import lsst.daf.persistence as dafPers
 import lsst.pex.policy
 
-HOST = "lsst10.ncsa.uiuc.edu"
+HOST = "lsst-db.ncsa.illinois.edu"
 PORT = "3306"
 
 

diff --git a/tests/Persistence_1.cc b/tests/Persistence_1.cc
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(PersistenceTest) {
     //without failing
     dafPersist::DbAuth testAuth;
     testAuth.setPolicy(policy);
-    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+    if(!testAuth.available("lsst-db.ncsa.illinois.edu","3306")){
         return;
     }
 
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(PersistenceTest) {
     MyPersistable mp(1.73205, 1.61803);
 
     dafPersist::LogicalLocation pathLoc("tests/data/MyPersistable.boost." + testIdString);
-    dafPersist::LogicalLocation dbLoc("mysql://lsst10.ncsa.uiuc.edu:3306/test");
+    dafPersist::LogicalLocation dbLoc("mysql://lsst-db.ncsa.illinois.edu:3306/test");
 
     {
         dafPersist::Persistence::Ptr persist =

diff --git a/tests/Persistence_2.cc b/tests/Persistence_2.cc
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(Persistence2Test) {
     //without failing
     dafPersist::DbAuth testAuth;
     testAuth.setPolicy(policy);
-    if(!testAuth.available("lsst10.ncsa.uiuc.edu","3306")){
+    if(!testAuth.available("lsst-db.ncsa.illinois.edu","3306")){
         return;
     }
 
@@ -218,7 +218,7 @@ BOOST_AUTO_TEST_CASE(Persistence2Test) {
     MyPersistable mp(1.73205, 1.61803);
 
     dafPersist::LogicalLocation pathLoc("tests/data/MyPersistable.boost." + testIdString);
-    dafPersist::LogicalLocation dbLoc("mysql://lsst10.ncsa.uiuc.edu:3306/test");
+    dafPersist::LogicalLocation dbLoc("mysql://lsst-db.ncsa.illinois.edu:3306/test");
 
     {
         dafPersist::Persistence::Ptr persist = dafPersist::Persistence::getPersistence(policy);

diff --git a/tests/Persistence_2.py b/tests/Persistence_2.py
@@ -26,7 +26,7 @@
 import lsst.pex.policy as pexPolicy
 import lsst.utils.tests
 
-HOST = "lsst10.ncsa.uiuc.edu"
+HOST = "lsst-db.ncsa.illinois.edu"
 PORT = "3306"
 
 

diff --git a/tests/testDbAuth.paf b/tests/testDbAuth.paf
@@ -1,24 +1,24 @@
 database: {
     authInfo: {
-        host: lsst10.ncsa.uiuc.edu
+        host: lsst-db.ncsa.illinois.edu
         port: 3307
         user: boris
         password: natasha
     }
     authInfo: {
-        host: lsst10.ncsa.uiuc.edu
+        host: lsst-db.ncsa.illinois.edu
         port: 3306
         user: test
         password: globular.test
     }
     authInfo: {
-        host: lsst10.ncsa.uiuc.edu
+        host: lsst-db.ncsa.illinois.edu
         port: 3306
         user: nottest
         password: notglobular.test
     }
     authInfo: {
-        host: lsst9.ncsa.uiuc.edu
+        host: lsst9.ncsa.illinois.edu
         port: 3306
         user: rocky
         password: squirrel