fixing tests (software-3799

Author: Diego Davila

bin/stashcp2/tests/test_inside_docker.sh

@@ -42,22 +42,22 @@ cp /StashCache/bin/stashcp2/tests/job.ad ./.job.ad
 
 # Test against a file that is known to not exist
 set +e
-/StashCache/stashcp.py --cache=$XRD_CACHE /blah/does/not/exist ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE /blah/does/not/exist ./
 if [ $? -eq 0 ]; then
   echo "Failed to exit with non-zero exit status when it should have"
   exit 1
 fi
 set -e
 
 # Try copying with no forward slash
-/StashCache/stashcp.py --cache=$XRD_CACHE user/dweitzel/public/blast/queries/query1 ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE user/dweitzel/public/blast/queries/query1 ./
 
 result=`md5sum query1 | awk '{print $1;}'`
 
 rm query1
 
 # Try copying with different destintion filename
-/StashCache/stashcp.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
 
 result=`md5sum query.test | awk '{print $1;}'`
 
@@ -68,7 +68,7 @@ fi
 rm -f query.test
 
 # Perform tests
-/StashCache/stashcp.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
 
 result=`md5sum query1 | awk '{print $1;}'`
 
@@ -78,7 +78,7 @@ fi
 rm -f query.test
 
 # Perform methods test
-/StashCache/stashcp.py --cache=$XRD_CACHE --method=cvmfs,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=cvmfs,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
 
 result=`md5sum query1 | awk '{print $1;}'`
 
@@ -88,7 +88,7 @@ fi
 rm -f query.test
 
 # Perform methods test
-/StashCache/stashcp.py --cache=$XRD_CACHE --method=xrootd -d /user/dweitzel/public/blast/queries/query1 ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=xrootd -d /user/dweitzel/public/blast/queries/query1 ./
 
 result=`md5sum query1 | awk '{print $1;}'`
 
@@ -98,7 +98,7 @@ fi
 rm -f query.test
 
 # Perform methods test
-/StashCache/stashcp.py --cache=$XRD_CACHE --method=http,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=http,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
 
 result=`md5sum query1 | awk '{print $1;}'`
 
@@ -108,7 +108,7 @@ fi
 rm -f query.test
 
 # Scheme test
-/StashCache/stashcp.py --cache=$XRD_CACHE --method=http,xrootd -d stash:///user/dweitzel/public/blast/queries/query1 file:///tmp
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=http,xrootd -d stash:///user/dweitzel/public/blast/queries/query1 file:///tmp
 
 result=`md5sum /tmp/query1 | awk '{print $1;}'`
 
@@ -117,7 +117,7 @@ if [ "$result" != "12bdb9a96cd5e8ca469b727a81593201" ]; then
 fi
 rm -f query.test
 
-/StashCache/stashcp.py --cache=$XRD_CACHE -d -r /user/dweitzel/public/blast/queries ./
+/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d -r /user/dweitzel/public/blast/queries ./
 ls -lah
 
 rm -rf queries