Skip to content

Fix test for new location #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djw8605 merged 2 commits into from
Apr 14, 2020
Merged

Fix test for new location #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bcf5a7
Fix test for new location
djw8605 Apr 14, 2020
9e36060
Fixing directory for tests
djw8605 Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/stashcp2/tests/setup_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ "${BUILD_TYPE}" = "http" ]; then
set -e

# Try copying with different destintion filename
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
stashcp --cache=$XRD_CACHE -d /osgconnect/public/dweitzel/blast/queries/query1 query.test

result=`md5sum query.test | awk '{print $1;}'`

Expand All @@ -33,7 +33,7 @@ if [ "${BUILD_TYPE}" = "http" ]; then
rm -f query.test

# Perform tests
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE -d /osgconnect/public/dweitzel/blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

Expand Down
16 changes: 8 additions & 8 deletions bin/stashcp2/tests/test_inside_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ fi
set -e

# Try copying with no forward slash
stashcp --cache=$XRD_CACHE user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE osgconnect/public/dweitzel/blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

rm query1

# Try copying with different destintion filename
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
stashcp --cache=$XRD_CACHE -d /osgconnect/public/dweitzel/blast/queries/query1 query.test

result=`md5sum query.test | awk '{print $1;}'`

Expand All @@ -73,7 +73,7 @@ fi
rm -f query.test

# Perform tests
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE -d /osgconnect/public/dweitzel/blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

Expand All @@ -83,7 +83,7 @@ fi
rm -f query.test

# Perform methods test
stashcp --cache=$XRD_CACHE --method=cvmfs,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE --method=cvmfs,xrootd -d /osgconnect/public/dweitzel/blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

Expand All @@ -93,7 +93,7 @@ fi
rm -f query.test

# Perform methods test
stashcp --cache=$XRD_CACHE --method=xrootd -d /user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE --method=xrootd -d /osgconnect/public/dweitzel//blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

Expand All @@ -103,7 +103,7 @@ fi
rm -f query.test

# Perform methods test
stashcp --cache=$XRD_CACHE --method=http,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
stashcp --cache=$XRD_CACHE --method=http,xrootd -d /osgconnect/public/dweitzel/blast/queries/query1 ./

result=`md5sum query1 | awk '{print $1;}'`

Expand All @@ -113,7 +113,7 @@ fi
rm -f query.test

# Scheme test
stashcp --cache=$XRD_CACHE --method=http,xrootd -d stash:///user/dweitzel/public/blast/queries/query1 file:///tmp
stashcp --cache=$XRD_CACHE --method=http,xrootd -d stash:///osgconnect/public/dweitzel/blast/queries/query1 file:///tmp

result=`md5sum /tmp/query1 | awk '{print $1;}'`

Expand All @@ -122,7 +122,7 @@ if [ "$result" != "12bdb9a96cd5e8ca469b727a81593201" ]; then
fi
rm -f query.test

stashcp --cache=$XRD_CACHE -d -r /user/dweitzel/public/blast/queries ./
stashcp --cache=$XRD_CACHE -d -r /osgconnect/public/dweitzel/blast/queries ./
ls -lah

rm -rf queries
Expand Down