Changed 32-test-upgrade.bats to actually check the update functionality of the newly developped version - also change the way of determining the versions

test/32-test-upgrade.bats

@@ -8,9 +8,16 @@ load '/getssl/test/test_helper.bash'
 # This is run for every test
 setup() {
     export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
-    CURRENT_VERSION=$(awk -F '"' '$1 == "VERSION=" {print $2}' ${CODE_DIR}/getssl)
-    PREVIOUS_VERSION=$(echo ${CURRENT_VERSION} | awk -F. '{ print $1 "." $2-1}')
     run git clone https://github.com/srvrco/getssl.git "$INSTALL_DIR/upgrade-getssl"
+    # Don't do version arithmetics any longer, look what there really is
+    cd "$INSTALL_DIR/upgrade-getssl"
+    CURRENT_VERSION=$(git tag -l|grep -e '^v'|tail -1|cut -b2-)
+    PREVIOUS_VERSION=$(git tag -l|grep -e '^v'|tail -2|head -1|cut -b2-)
+    # The version in the file, which we will overwrite
+    FILE_VERSION=$(awk -F'"' '/^VERSION=/{print $2}' "$CODE_DIR/getssl")
+echo "============ FILE_VERSION ==========="
+echo "${FILE_VERSION}"
+echo "============ FILE_VERSION ==========="
 }
 
 
@@ -31,6 +38,15 @@ teardown() {
     setup_environment
     init_getssl
     cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_CMD_HOST}/getssl.cfg"
+    # Overwrite checked out getssl-script with copy of new one, 
+    # but write the previous version into the copy
+    # Note that this way we actually downgrade getssl, but we are testing
+    # the upgrading of the version in development
+    cp "$CODE_DIR/getssl" "$INSTALL_DIR/upgrade-getssl/"
+    sed -i -e "s/VERSION=\"${FILE_VERSION}\"/VERSION=\"${PREVIOUS_VERSION}\"/" "$INSTALL_DIR/upgrade-getssl/getssl" 
+echo "============ VERSION ==========="
+egrep '^VERSION='  "$INSTALL_DIR/upgrade-getssl/getssl" 
+echo "============ VERSION ==========="
     run "$INSTALL_DIR/upgrade-getssl/getssl" --check-config ${GETSSL_CMD_HOST}
     assert_success
     #assert_line "Updated getssl from v${PREVIOUS_VERSION} to v${CURRENT_VERSION}"
@@ -45,12 +61,18 @@ teardown() {
     fi
 
     cd "$INSTALL_DIR/upgrade-getssl"
-    git checkout tags/v${PREVIOUS_VERSION}
+    git checkout tags/v${CURRENT_VERSION}
 
     CONFIG_FILE="getssl-http01.cfg"
     setup_environment
     init_getssl
     cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_CMD_HOST}/getssl.cfg"
+    # Overwrite checked out getssl-script with copy of new one, 
+    # but write the previous version into the copy
+    # Note that this way we actually downgrade getssl, but we are testing
+    # the upgrading of the version in development
+    cp "$CODE_DIR/getssl" "$INSTALL_DIR/upgrade-getssl/"
+    sed -i -e "s/VERSION=\"${FILE_VERSION}\"/VERSION=\"${PREVIOUS_VERSION}\"/" "$INSTALL_DIR/upgrade-getssl/getssl" 
     run "$INSTALL_DIR/upgrade-getssl/getssl" --check-config --upgrade ${GETSSL_CMD_HOST}
     assert_success
     assert_line "Updated getssl from v${PREVIOUS_VERSION} to v${CURRENT_VERSION}"
@@ -71,6 +93,12 @@ teardown() {
     setup_environment
     init_getssl
     cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_CMD_HOST}/getssl.cfg"
+    # Overwrite checked out getssl-script with copy of new one, 
+    # but write the previous version into the copy
+    # Note that this way we actually downgrade getssl, but we are testing
+    # the upgrading of the version in development
+    cp "$CODE_DIR/getssl" "$INSTALL_DIR/upgrade-getssl/"
+    sed -i -e "s/VERSION=\"${FILE_VERSION}\"/VERSION=\"${PREVIOUS_VERSION}\"/" "$INSTALL_DIR/upgrade-getssl/getssl" 
     run bash ./getssl --check-config --upgrade ${GETSSL_CMD_HOST}
     assert_success
     assert_line "Updated getssl from v${PREVIOUS_VERSION} to v${CURRENT_VERSION}"