Skip to content

Commit 9a68465

Browse files
andamianAdrian Damian
andamian
and
Adrian Damian
authored
Make int test for new and old services co-exist for a while (#216)
Co-authored-by: Adrian Damian <[email protected]>
1 parent 40c1767 commit 9a68465

27 files changed

+2787
-403
lines changed

‎vos/test/scripts/README‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ at the CADC. These tests can only be executed at the CADC against that
33
service. The vos package must be installed before the these tests
44
are executed.
55

6-
Environment variables (optional):
7-
VOSPACE_WEBSERVICE = URL of the VOSpace service host (Default: "www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca")
6+
Environment variables:
7+
VOSPACE_WEBSERVICE (optional) = URL of the VOSpace service host (Default: "www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca")
8+
CADC_TESTCERT_PATH (required) = Path to local directories containing 2 proxy certificates:
9+
- cadc-auth.pem - proxy certificate of the owner of the vospace root directory
10+
- cadc-auth-test.pem - proxy certificate of a valid user.

‎vos/test/scripts/something.props‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎vos/test/scripts/vospace-all.tcsh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
set THIS_DIR = `dirname $0`
44
set THIS_DIR = `cd $THIS_DIR && pwd`
55

6-
echo "Enter path to the CADC test certificates"
7-
echo -n "Cert path: "
8-
set certpath = "$<"
9-
setenv CADC_TESTCERT_PATH ${certpath}
10-
11-
echo "cert files path: $CADC_TESTCERT_PATH"
6+
#echo "Enter path to the CADC test certificates"
7+
#echo -n "Cert path: "
8+
#set certpath = "$<"
9+
#setenv CADC_TESTCERT_PATH ${certpath}
10+
#
11+
#echo "cert files path: $CADC_TESTCERT_PATH"
1212
echo
1313
echo "*** start all tests ***"
1414
echo "vospace-client-atest.tcsh"
@@ -20,8 +20,8 @@ echo "vospace-delete-permission-atest.tcsh"
2020
$THIS_DIR/vospace-delete-permission-atest.tcsh $args || echo "FAIL vospace-delete-permission-atest.tcsh" && exit -1
2121
echo "vospace-vsync-atest.tcsh"
2222
$THIS_DIR/vospace-vsync-atest.tcsh $args || echo "FAIL vospace-vsync-atest.tcsh" && exit -1
23-
echo "vospace-quota-atest.tcsh"
24-
$THIS_DIR/vospace-quota-atest.tcsh $args || echo "FAIL vospace-quota-atest.tcsh" && exit -1
23+
#echo "vospace-quota-atest.tcsh"
24+
#$THIS_DIR/vospace-quota-atest.tcsh $args || echo "FAIL vospace-quota-atest.tcsh" && exit -1
2525
echo "vospace-link-atest.tcsh"
2626
$THIS_DIR/vospace-link-atest.tcsh $args || echo "FAIL vospace-link-atest.tcsh" && exit -1
2727
echo "vospace-read-permission-atest.tcsh"

‎vos/test/scripts/vospace-client-atest.tcsh‎

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ else
1212
endif
1313

1414
if (! ${?CADC_TESTCERT_PATH} ) then
15-
echo "CADC_TESTCERT_PATH env variable not set. Must point to the location of x509_CADCRegtest1.pem cert file"
15+
echo "Missing CADC_TESTCERT_PATH location to cadc-auth.pem and cadc-auth-test.pem files"
1616
exit -1
1717
else
18-
set CERTFILE = "$CADC_TESTCERT_PATH/x509_CADCRegtest1.pem"
19-
echo "cert file: (CADC_TESTCERT_PATH env variable): $CERTFILE"
18+
echo "cert files path: ($CADC_TESTCERT_PATH env variable): $CADC_TESTCERT_PATH"
19+
set CERT = "--cert=$CADC_TESTCERT_PATH/cadc-auth.pem"
2020
endif
2121

2222
if (! ${?TMPDIR} ) then
@@ -26,14 +26,13 @@ else
2626
echo "Using ${TMPDIR} for temporary files"
2727
endif
2828

29-
set LSCMD = "vls -l"
30-
set MKDIRCMD = "vmkdir"
31-
set RMCMD = "vrm"
32-
set CPCMD = "vcp"
33-
set RMDIRCMD = "vrmdir"
34-
set CHMODCMD = "vchmod"
35-
36-
set CERT = " --cert=$CERTFILE"
29+
set LSCMD = "vls -l -k"
30+
set MKDIRCMD = "vmkdir -k"
31+
set RMCMD = "vrm -k"
32+
set CPCMD = "vcp -k"
33+
set RMDIRCMD = "vrmdir -k"
34+
set CHMODCMD = "vchmod -k"
35+
set VTAGCMD = 'vtag -k'
3736

3837
echo "vls command: " $LSCMD $CERT
3938
echo
@@ -50,33 +49,30 @@ foreach resource ($resources)
5049
echo "************* TESTING AGAINST $resource ****************"
5150

5251
# use resourceID in vos-config to determine the base URI
53-
# vault uses CADCRegtest1, cavern uses home/cadcregtest1
5452
echo $resource | grep "cavern" >& /dev/null
5553
if ( $status == 0) then
56-
set VOROOT = "arc:"
57-
set HOME_BASE = "home/cadcregtest1"
54+
set VOROOT = "cavern:"
5855
set TESTING_CAVERN = "true"
5956
else
6057
set VOROOT = "vos:"
61-
set HOME_BASE = "CADCRegtest1"
58+
6259
endif
60+
set HOME_BASE = "vostools-inttest"
6361
set VOHOME = "$VOROOT""$HOME_BASE"
64-
set BASE = "$VOHOME/atest"
62+
set BASE = $VOHOME
6563

6664
set TIMESTAMP=`date +%Y-%m-%dT%H-%M-%S`
6765
set CONTAINER = $BASE/$TIMESTAMP
6866

6967

7068
echo -n "** checking base URI"
71-
$LSCMD $CERT $BASE > /dev/null
72-
if ( $status == 0) then
73-
echo " [OK]"
74-
else
75-
echo -n ", creating base URI"
76-
exit
77-
$MKDIRCMD $CERT $BASE || echo " [FAIL]" && exit -1
78-
echo " [OK]"
79-
endif
69+
$RMCMD $CERT $BASE > /dev/null
70+
71+
# echo -n ", creating base URI"
72+
# $MKDIRCMD $CERT $BASE || echo " [FAIL]" && exit -1
73+
# $VTAGCMD $CERT $BASE 'ivo://cadc.nrc.ca/vospace/core#inheritPermissions=true'
74+
# echo " [OK]"
75+
8076
echo -n "** setting home and base to public, no groups"
8177
$CHMODCMD $CERT o+r $VOHOME || echo " [FAIL]" && exit -1
8278
echo -n " [OK]"
@@ -107,43 +103,43 @@ foreach resource ($resources)
107103

108104
echo -n "verify public=false after create "
109105
if ( ${?TESTING_CAVERN} ) then
110-
echo " [SKIPPED, permission inheitance not supported]"
106+
echo " [SKIPPED, permission inheritance not supported]"
111107
else
112108
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'drw----r--' || echo " [FAIL]" && exit -1
113109
echo " [OK]"
114110
endif
115111

116112
echo -n "check set permission properties "
117113
if ( ${?TESTING_CAVERN} ) then
118-
echo " [SKIPPED, permission inheitance not supported]"
114+
echo " [SKIPPED, permission inheritance not supported]"
119115
else
120-
$CHMODCMD $CERT g+rw $CONTAINER test:g1 test:g2 || echo " [FAIL]" && exit -1
116+
$CHMODCMD $CERT g+rw $CONTAINER test-g1 test-g2 || echo " [FAIL]" && exit -1
121117
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'drw-rw-r--' || echo " [FAIL]" && exit -1
122-
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'test:g1' || echo " [FAIL]" && exit -1
123-
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'test:g2' || echo " [FAIL]" && exit -1
118+
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'test-g1' || echo " [FAIL]" && exit -1
119+
$LSCMD $CERT $BASE | grep $TIMESTAMP | grep -q 'test-g2' || echo " [FAIL]" && exit -1
124120
echo " [OK]"
125121
endif
126122

127123
echo -n "check inherit permission properties "
128124
if ( ${?TESTING_CAVERN} ) then
129-
echo " [SKIPPED, permission inheitance not supported]"
125+
echo " [SKIPPED, permission inheritance not supported]"
130126
else
131127
$MKDIRCMD $CERT $CONTAINER/pub || echo " [FAIL]" && exit -1
132128
$LSCMD $CERT $CONTAINER | grep pub | grep -q 'drw-rw-r--' || echo " [FAIL]" && exit -1
133-
$LSCMD $CERT $CONTAINER | grep pub | grep -q 'test:g1' || echo " [FAIL]" && exit -1
134-
$LSCMD $CERT $CONTAINER | grep pub | grep -q 'test:g2' || echo " [FAIL]" && exit -1
129+
$LSCMD $CERT $CONTAINER | grep pub | grep -q 'test-g1' || echo " [FAIL]" && exit -1
130+
$LSCMD $CERT $CONTAINER | grep pub | grep -q 'test-g2' || echo " [FAIL]" && exit -1
135131
echo " [OK]"
136132
endif
137133

138134
echo -n "check inherit + change certain properties "
139135
if ( ${?TESTING_CAVERN} ) then
140-
echo " [SKIPPED, permission inheitance not supported]"
136+
echo " [SKIPPED, permission inheritance not supported]"
141137
else
142138
$MKDIRCMD $CERT $CONTAINER/priv || echo " [FAIL]" && exit -1
143-
$CHMODCMD $CERT g+r $CONTAINER/priv test:g3 || echo " [FAIL]" && exit -1
139+
$CHMODCMD $CERT g+r $CONTAINER/priv test-g3 || echo " [FAIL]" && exit -1
144140
$LSCMD $CERT $CONTAINER | grep priv | grep -q 'drw-rw-r--' || echo " [FAIL]" && exit -1
145-
$LSCMD $CERT $CONTAINER | grep priv | grep -q 'test:g3' || echo " [FAIL]" && exit -1
146-
$LSCMD $CERT $CONTAINER | grep priv | grep -q 'test:g2' || echo " [FAIL]" && exit -1
141+
$LSCMD $CERT $CONTAINER | grep priv | grep -q 'test-g3' || echo " [FAIL]" && exit -1
142+
$LSCMD $CERT $CONTAINER | grep priv | grep -q 'test-g2' || echo " [FAIL]" && exit -1
147143
echo " [OK]"
148144
endif
149145

@@ -159,24 +155,24 @@ foreach resource ($resources)
159155
echo -n "copy empty files"
160156
rm -f /tmp/zerosize.txt
161157
touch /tmp/zerosize.txt
162-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
158+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL1]" && exit -1
163159
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null || echo " [FAIL]" && exit -1
164160
# repeat
165-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
161+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL2]" && exit -1
166162
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null || echo " [FAIL]" && exit -1
167163
# change size
168164
echo "test" > /tmp/zerosize.txt
169-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
165+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL3]" && exit -1
170166
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null && echo " [FAIL]" && exit -1
171167
# repeat
172-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
168+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL4]" && exit -1
173169
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null && echo " [FAIL]" && exit -1
174170
# make it back 0 size
175171
/bin/cp /dev/null /tmp/zerosize.txt
176-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
172+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL5]" && exit -1
177173
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null || echo " [FAIL]" && exit -1
178174
# repeat
179-
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL]" && exit -1
175+
$CPCMD $CERT /tmp/zerosize.txt $CONTAINER || echo " [FAIL6]" && exit -1
180176
$LSCMD $CERT $CONTAINER/zerosize.txt | awk '{print $5}'| grep "0" >& /dev/null || echo " [FAIL]" && exit -1
181177
echo " [OK]"
182178

@@ -187,8 +183,8 @@ foreach resource ($resources)
187183
echo " [OK]"
188184

189185
echo -n "copy data node to local filesystem "
190-
$CPCMD $CERT $CONTAINER/something.png $THIS_DIR/something.png.2 || echo " [FAIL]" && exit -1
191-
cmp $THIS_DIR/something.png $THIS_DIR/something.png.2 || echo " [FAIL]" && exit -1
186+
$CPCMD $CERT $CONTAINER/something.png $THIS_DIR/something.png.2 || echo " [FAIL1]" && exit -1
187+
cmp $THIS_DIR/something.png $THIS_DIR/something.png.2 || echo " [FAIL2]" && exit -1
192188
\rm -f $THIS_DIR/something.png.2
193189
echo " [OK]"
194190

@@ -210,7 +206,7 @@ foreach resource ($resources)
210206
echo " [OK]"
211207

212208
echo -n "Do a real cutout of a known file"
213-
#$CPCMD $CERT "vos:CADCRegtest1/DONOTDELETE_VOSPACE_CUTOUT_TEST.fits(34.436194,19.34665,0.01)" $TMPDIR/testcutout || echo " [FAIL]" && exit -1
209+
#$CPCMD $CERT "vos:CADCAuthtest1/DONOTDELETE_VOSPACE_CUTOUT_TEST.fits(34.436194,19.34665,0.01)" $TMPDIR/testcutout || echo " [FAIL]" && exit -1
214210
#if (`cat $TMPDIR/testcutout | md5` != "cb7d6a829277975d1016a769970ec45a") then
215211
# echo " [FAIL]" && exit -1
216212
#endif
@@ -251,19 +247,19 @@ foreach resource ($resources)
251247
$RMCMD $CERT $CONTAINER/something.png >& /dev/null && echo " [FAIL]" && exit -1
252248
echo " [OK]"
253249

254-
echo -n "delete non-empty container "
255-
$RMDIRCMD $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
256-
$LSCMD $CERT $CONTAINER/something2.png >& /dev/null && echo " [FAIL]" && exit -1
257-
$LSCMD $CERT $CONTAINER >& /dev/null && echo " [FAIL]" && exit -1
258-
echo " [OK]"
259-
260-
echo -n "delete empty container "
261-
$MKDIRCMD $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
262-
$LSCMD $CERT $CONTAINER > /dev/null || echo " [FAIL]" && exit -1
263-
$RMDIRCMD $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
264-
$LSCMD $CERT $CONTAINER >& /dev/null && echo " [FAIL]" && exit -1
265-
echo " [OK]"
266-
echo
250+
# echo -n "delete non-empty container - THIS NOW REQURIES vrm -R INSTEAD"
251+
# $RMCMD -R $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
252+
# $LSCMD $CERT $CONTAINER/something2.png >& /dev/null && echo " [FAIL]" && exit -1
253+
# $LSCMD $CERT $CONTAINER >& /dev/null && echo " [FAIL]" && exit -1
254+
# echo " [OK]"
255+
256+
# echo -n "delete empty container "
257+
# $MKDIRCMD $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
258+
# $LSCMD $CERT $CONTAINER > /dev/null || echo " [FAIL]" && exit -1
259+
# $RMDIRCMD $CERT $CONTAINER >& /dev/null || echo " [FAIL]" && exit -1
260+
# $LSCMD $CERT $CONTAINER >& /dev/null && echo " [FAIL]" && exit -1
261+
# echo " [OK]"
262+
# echo
267263
echo "*** test sequence passed for resource $resource ***"
268264
end
269265

‎vos/test/scripts/vospace-delete-permission-atest.tcsh‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ else
1010
endif
1111

1212
if (! ${?CADC_TESTCERT_PATH} ) then
13-
echo "CADC_TESTCERT_PATH env variable not set. Must point to the location of test cert files"
14-
exit -1
13+
echo "Missing CADC_TESTCERT_PATH location to cadc-auth.pem and cadc-auth-test.pem files"
14+
exit -1
1515
else
1616
echo "cert files path: ($CADC_TESTCERT_PATH env variable): $CADC_TESTCERT_PATH"
17+
set CERT = "--cert=$CADC_TESTCERT_PATH/cadc-auth.pem"
18+
set CERT1 = "--cert=$CADC_TESTCERT_PATH/cadc-auth-test.pem"
1719
endif
1820

1921
if($#argv == 0) then
@@ -24,44 +26,50 @@ else
2426
echo "Testing against resources: $resources"
2527
endif
2628

27-
set CHMODCMD = "vchmod"
28-
set MKDIRCMD = "vmkdir"
29-
set LSCMD = "vls -l"
30-
set CPCMD = "vcp"
31-
set RMDIRCMD = "vrmdir"
29+
set CHMODCMD = "vchmod -k"
30+
set MKDIRCMD = "vmkdir -k"
31+
set LSCMD = "vls -k -l"
32+
set CPCMD = "vcp -k"
33+
set RMDIRCMD = "vrmdir -k"
34+
set RMCMD = "vrm -k"
35+
set VTAGCMD = "vtag -k"
3236

33-
set CERT = "--cert=$CADC_TESTCERT_PATH/x509_CADCRegtest1.pem"
37+
set CADC_TESTCERT_PATH = "/Users/adriand/A/test-certificates"
38+
set CERT = "--cert=$CADC_TESTCERT_PATH/cadcproxy.pem"
3439
set CERT1 = "--cert=$CADC_TESTCERT_PATH/x509_CADCAuthtest1.pem"
3540
set CERT2 = "--cert=$CADC_TESTCERT_PATH/x509_CADCAuthtest2.pem"
3641

37-
echo "vchmod command: " $CHMODCMD $CERT
38-
echo "vchmod command 1: " $CHMODCMD $CERT1
39-
echo "vchmod command 2: " $CHMODCMD $CERT2
40-
41-
echo
42-
4342
# group 3000 aka CADC_TEST_GROUP1 has members: CADCAuthtest1
4443
set GROUP1 = "CADC_TEST_GROUP1"
4544

4645
# group 3100 aka CADC_TEST_GROUP2 has members: CADCAuthtest1, CADCAuthtest2
4746
set GROUP2 = "CADC_TEST_GROUP2"
4847

48+
echo "vchmod command: " $CHMODCMD $CERT
49+
echo "vchmod command 1: " $CHMODCMD $CERT1
50+
51+
echo
52+
4953
foreach resource ($resources)
5054
echo "************* TESTING AGAINST $resource ****************"
5155

52-
# vault uses CADCRegtest1, cavern uses home/cadcregtest1
5356
echo $resource | grep "cavern" >& /dev/null
5457
if ( $status == 0) then
55-
set HOME_BASE = "home/cadcregtest1"
56-
set VOROOT = "arc:"
58+
set VOROOT = "cavern:"
5759
set TESTING_CAVERN = "true"
5860
else
5961
set VOROOT = "vos:"
60-
set HOME_BASE = "CADCRegtest1"
6162
endif
6263

64+
set HOME_BASE = "vostools-inttest"
6365
set VOHOME = "$VOROOT""$HOME_BASE"
64-
set BASE = "$VOHOME/atest"
66+
set BASE = $VOHOME
67+
68+
# echo -n ", creating base URI"
69+
# $RMCMD -R $CERT $BASE > /dev/null
70+
# $MKDIRCMD $CERT $BASE || echo " [FAIL]" && exit -1
71+
# $VTAGCMD $CERT $BASE 'ivo://cadc.nrc.ca/vospace/core#inheritPermissions=true'
72+
echo " [OK]"
6573

6674
set TIMESTAMP=`date +%Y-%m-%dT%H-%M-%S`
6775
set CONTAINER = $BASE/$TIMESTAMP
@@ -130,7 +138,8 @@ foreach resource ($resources)
130138
if ( ${?TESTING_CAVERN} ) then
131139
echo " [SKIPPED, permission inheritance not supported]"
132140
else
133-
$RMDIRCMD $CERT1 $CONTAINER/sub1 >& /dev/null || echo " [FAIL]" && exit -1
141+
echo "$RMCMD -R $CERT1 $CONTAINER/sub1"
142+
$RMCMD -R $CERT1 $CONTAINER/sub1 >& /dev/null || echo " [FAIL]" && exit -1
134143
echo -n " verify "
135144
$LSCMD $CERT $CONTAINER/sub1 >& /dev/null && echo " [FAIL]" && exit -1
136145
echo " [OK]"
@@ -159,7 +168,7 @@ foreach resource ($resources)
159168
echo " [OK]"
160169

161170
echo -n "test root delete"
162-
$RMDIRCMD $CERT $CONTAINER/sub1 >& /dev/null || echo " [FAIL]" && exit -1
171+
$RMCMD -R $CERT $CONTAINER/sub1 >& /dev/null || echo " [FAIL]" && exit -1
163172
echo -n " verify "
164173
$LSCMD $CERT1 $CONTAINER/sub1 >& /dev/null && echo " [FAIL]" && exit -1
165174
echo " [OK]"

0 commit comments

Comments
 (0)