From 004424d01b8d0289034bdb77c1e35d57a75bb601 Mon Sep 17 00:00:00 2001 From: BjornMagnussonXA Date: Wed, 17 Mar 2021 14:22:20 +0100 Subject: [PATCH 1/1] Workaround when running tests using Linux on Win Print info and delay container start when using Linux on Win Minor correction in README Issue-ID: NONRTRIC-468 Signed-off-by: BjornMagnussonXA Change-Id: I2bf36ad5ac751c1e4482ced809312a7bd0b6dcf4 --- test/auto-test/README.md | 2 +- test/common/testcase_common.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/auto-test/README.md b/test/auto-test/README.md index 52f00109..871eb98b 100644 --- a/test/auto-test/README.md +++ b/test/auto-test/README.md @@ -17,7 +17,7 @@ A test script, for example FTC1, is executed from the cmd line using the script ./FTC1.sh remote docker --env-file ../common/test_env-oran-cherry.sh -Note that is running on a released verion, the parameter "release" shall be included to run the released images. +Note that not is running on a released verion, the parameter "release" shall be included to run the released images. See the README.md in `../common/` for all details about available parameters and their meaning. diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh index 3e1003d9..dc5415b2 100755 --- a/test/common/testcase_common.sh +++ b/test/common/testcase_common.sh @@ -1873,6 +1873,13 @@ __start_container() { appcount=$1 shift + os_version=$(uname -a 2> /dev/null | awk '{print tolower($0)}' | grep "mircosoft") + if [[ "$os_version" == *"mircosoft"* ]]; then + echo -e $YELLOW" Workaround for Linux on Win - delay container start, 1 sec, to make sure files mounted in the container are available on disk - WLS problem"$EYELLOW + sleep 1 + fi + + if [ "$compose_args" == "NODOCKERARGS" ]; then docker-compose -f $compose_file up -d &> .dockererr if [ $? -ne 0 ]; then -- 2.16.6