Skip to content

Commit 260224f

Browse files
author
Diego Davila
committed
Install the package before testing it (software-3799)
1 parent d2b00b3 commit 260224f

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

bin/stashcp2/tests/test_inside_docker.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,30 @@ module load xrootd
3737
# For now, disable pylint failures
3838
#pylint /StashCache/bin/stashcp || /bin/true
3939

40+
# Install stashcp
41+
pip install StashCache/
42+
4043
# Copy in the .job.ad file:
4144
cp /StashCache/bin/stashcp2/tests/job.ad ./.job.ad
4245

4346
# Test against a file that is known to not exist
4447
set +e
45-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE /blah/does/not/exist ./
48+
stashcp --cache=$XRD_CACHE /blah/does/not/exist ./
4649
if [ $? -eq 0 ]; then
4750
echo "Failed to exit with non-zero exit status when it should have"
4851
exit 1
4952
fi
5053
set -e
5154

5255
# Try copying with no forward slash
53-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE user/dweitzel/public/blast/queries/query1 ./
56+
stashcp --cache=$XRD_CACHE user/dweitzel/public/blast/queries/query1 ./
5457

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

5760
rm query1
5861

5962
# Try copying with different destintion filename
60-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
63+
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 query.test
6164

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

@@ -68,7 +71,7 @@ fi
6871
rm -f query.test
6972

7073
# Perform tests
71-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
74+
stashcp --cache=$XRD_CACHE -d /user/dweitzel/public/blast/queries/query1 ./
7275

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

@@ -78,7 +81,7 @@ fi
7881
rm -f query.test
7982

8083
# Perform methods test
81-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=cvmfs,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
84+
stashcp --cache=$XRD_CACHE --method=cvmfs,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
8285

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

@@ -88,7 +91,7 @@ fi
8891
rm -f query.test
8992

9093
# Perform methods test
91-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=xrootd -d /user/dweitzel/public/blast/queries/query1 ./
94+
stashcp --cache=$XRD_CACHE --method=xrootd -d /user/dweitzel/public/blast/queries/query1 ./
9295

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

@@ -98,7 +101,7 @@ fi
98101
rm -f query.test
99102

100103
# Perform methods test
101-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=http,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
104+
stashcp --cache=$XRD_CACHE --method=http,xrootd -d /user/dweitzel/public/blast/queries/query1 ./
102105

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

@@ -108,7 +111,7 @@ fi
108111
rm -f query.test
109112

110113
# Scheme test
111-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE --method=http,xrootd -d stash:///user/dweitzel/public/blast/queries/query1 file:///tmp
114+
stashcp --cache=$XRD_CACHE --method=http,xrootd -d stash:///user/dweitzel/public/blast/queries/query1 file:///tmp
112115

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

@@ -117,7 +120,7 @@ if [ "$result" != "12bdb9a96cd5e8ca469b727a81593201" ]; then
117120
fi
118121
rm -f query.test
119122

120-
/StashCache/stashcp/__init__.py --cache=$XRD_CACHE -d -r /user/dweitzel/public/blast/queries ./
123+
stashcp --cache=$XRD_CACHE -d -r /user/dweitzel/public/blast/queries ./
121124
ls -lah
122125

123126
rm -rf queries

0 commit comments

Comments
 (0)