Fix test_install.sh when testing a new CCF release (#2005)

Author: jumaffre

.azure-pipelines-templates/install.yml

@@ -23,7 +23,7 @@ steps:
 
   - script: |
       sudo apt -y install ./$(pkgname)
-      cat /tmp/install_prefix | xargs ./test_install.sh
+      cat /tmp/install_prefix | xargs -i bash -c "PYTHON_PACKAGE_PATH=../python ./test_install.sh {}"
     workingDirectory: build
     displayName: Test installed CCF
 

src/host/main.cpp

@@ -743,8 +743,7 @@ int main(int argc, char** argv)
       else
       {
         LOG_FAIL_FMT(
-          "No snapshot found. Node will request transactions all historical "
-          "transactions");
+          "No snapshot found: Node will request all historical transactions");
       }
     }
 

tests/reconfiguration.py

@@ -172,8 +172,7 @@ def run(args):
             test_add_node_from_snapshot(network, args, copy_ledger_read_only=False)
             errors, _ = network.get_joined_nodes()[-1].stop()
             if not any(
-                "No snapshot found. Node will request transactions all historical transactions"
-                in s
+                "No snapshot found: Node will request all historical transactions" in s
                 for s in errors
             ):
                 raise ValueError(

tests/sandbox/sandbox.sh

@@ -38,7 +38,14 @@ if [ -f "${VERSION_FILE}" ]; then
     BINARY_DIR=${PATH_HERE}
     START_NETWORK_SCRIPT="${PATH_HERE}"/start_network.py
     VERSION=$(<"${VERSION_FILE}")
-    pip install --disable-pip-version-check -q -U ccf=="$VERSION"
+    if [ ! -z "${PYTHON_PACKAGE_PATH}" ]; then
+        # With an install tree, the python package can be specified, e.g. when testing
+        # an install just before it is released
+        echo "Using python package: ${PYTHON_PACKAGE_PATH}"
+        pip install --disable-pip-version-check -q -U -e "${PYTHON_PACKAGE_PATH}"
+    else
+        pip install --disable-pip-version-check -q -U ccf=="$VERSION"
+    fi
     pip install --disable-pip-version-check -q -U -r "${PATH_HERE}"/requirements.txt
 else
     # source tree

tests/test_install.sh

@@ -17,6 +17,9 @@ echo "Install prefix is ${1}"
 
 # Setup env
 INSTALL_PREFIX="$1"
+if [ ! -z "$PYTHON_PACKAGE_PATH" ]; then
+    PYTHON_PACKAGE_PATH=$(realpath -s "${PYTHON_PACKAGE_PATH}")
+fi
 working_dir="nested/run"
 rm -rf "$working_dir"
 mkdir -p "$working_dir"
@@ -28,11 +31,19 @@ timeout --signal=SIGINT --kill-after=${network_live_time}s --preserve-status ${n
 "$INSTALL_PREFIX"/bin/sandbox.sh -e release --verbose &
 
 # Poll until service is open
-while [ ! "$(service_http_status)" == "200" ]; do
+polls=0
+while [ ! "$(service_http_status)" == "200" ] && [ ${polls} -lt ${network_live_time} ]; do
     echo "Waiting for service to open..."
+    polls=$((polls+1))
     sleep 1
 done
 
+if [ ! "$(service_http_status)" == "200" ]; then
+    echo "Error: Timeout waiting for service to open"
+    kill "$(jobs -p)"
+    exit 1
+fi
+
 # Issue tutorial transactions to ephemeral network
 python3.8 -m venv env
 # shellcheck source=/dev/null
@@ -41,7 +52,7 @@ python -m pip install ../../../python
 python ../../../python/tutorial.py ./workspace/sandbox_0/0.ledger/ ./workspace/sandbox_common/
 
 # Test Python package CLI
-../../../tests//test_python_cli.sh > test_python_cli.out
+../../../tests/test_python_cli.sh > test_python_cli.out
 
 # Poll until service has died
 while [ "$(service_http_status)" == "200" ]; do