Fixed broken tests, esp. those broken by the change from PolicyNotAuthorized -> HTTPForbidden errors

Author: tzumainn

tests/functional/test-lessee-id.sh

@@ -43,7 +43,7 @@ echo "OFFER CLAIM INVALID USER TEST"
 
 openstack --os-cloud test1-subproject-1 esi offer claim $test_offer_uuid -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error='esi_leap:offer:offer_admin is disallowed by policy'
+expected_error="Access was denied to offer $test_offer_uuid."
 
 if ! grep -q "$expected_error" $errfile; then
   if [[ $ec -eq 0 ]]; then

tests/functional/test-no-lessee-id.sh

@@ -7,7 +7,7 @@ end=$(date -d "+5 days" +%Y-%m-%d)
 
 # Setup script, contains offer create test
 
-./setup.sh $tmpfile $project_id $start $end $resource_type
+./setup.sh $tmpfile $project_id $start $end
 
 . $tmpfile
 
@@ -28,7 +28,7 @@ openstack --os-cloud test1 esi offer create \
   $node_uuid \
   --start-time $start \
   --end-time $end \
-  --resource-type $resource_type \
+  --resource-type dummy_node \
   -f shell > $tmpfile 2> $errfile
 ec=$?
 expected_error="Time conflict for dummy_node $node_uuid."

tests/functional/test-no-offer.sh

@@ -76,7 +76,7 @@ openstack --os-cloud test2 esi offer create \
   --resource-type dummy_node \
   -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error="esi_leap:offer:offer_admin is disallowed by policy"
+expected_error="Access was denied to dummy_node $node_uuid."
 
 if ! cat $errfile | grep -q "$expected_error"; then
   if [[ $ec -eq 0 ]]; then
@@ -109,7 +109,7 @@ openstack --os-cloud test2 esi lease create \
   --resource-type dummy_node \
   -f shell > $tmpfile 2> $errfile
 ec=$?
-expected_error="esi_leap:offer:offer_admin is disallowed by policy"
+expected_error="Access was denied to dummy_node $node_uuid."
 
 if ! cat $errfile | grep -q "$expected_error"; then
   if [[ $ec -eq 0 ]]; then

tests/functional/test-offer-expire.sh

@@ -14,17 +14,18 @@ end=$(date -d "+1 minute" +"%Y-%m-%d %H:%M:%S")
 # The uuid variable will be overwritten, so we save it here
 test_offer_uuid=$uuid
 # Run cleanup if the script exits, contains offer delete test
+# Note: deletion will fail if handling of expired offers works
 trap "./cleanup.sh $test_offer_uuid; rm -f $tmpfile $errfile $nodefile" EXIT
 
-sleep 2m
-date +"%Y-%m-%D %H:%M:%S"
-
 ###################################
 ## OFFER LIST EXPIRED OFFER TEST ##
 ###################################
 
 echo "OFFER LIST EXPIRED OFFER TEST"
 
+sleep 2m
+date +"%Y-%m-%D %H:%M:%S"
+
 openstack --os-cloud test1-subproject esi offer list -f json > $tmpfile \
   || { ec=$?; echo "ERROR: failed to list offers" >&2; exit $ec; }
 cat $tmpfile