From 375e5105ff8c7bc331a615fb25ca8ca8d78b50bd Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 2 Oct 2023 10:14:18 -0600 Subject: [PATCH 1/5] Update Release Notes --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c92394242d..50c0ea53b5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,7 +7,7 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.3 - TBD -* Mitigate the problem of test interference. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755). +* Mitigate the problem of remote/nczarr-related test interference. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755). * Extend NCZarr to support unlimited dimensions. See [Github #2755](https://github.com/Unidata/netcdf-c/pull/2755). * Fix significant bug in the NCZarr cache management. See [Github #2737](https://github.com/Unidata/netcdf-c/pull/2737). * Fix default parameters for caching of NCZarr. See [Github #2734](https://github.com/Unidata/netcdf-c/pull/2734). From 5f5f908a9616eefbde5d876176b5efe61b74119b Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 9 Oct 2023 10:18:04 -0600 Subject: [PATCH 2/5] Remove vestigial file glob stanza --- dap4_test/CMakeLists.txt | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt index a44c5eb1dc..ab16df6290 100644 --- a/dap4_test/CMakeLists.txt +++ b/dap4_test/CMakeLists.txt @@ -78,15 +78,4 @@ ENDIF(ENABLE_TESTS) #FILE(COPY ./cdltestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) #FILE(COPY ./rawtestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) -## Specify files to be distributed by 'make dist' -FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh -${CMAKE_CURRENT_SOURCE_DIR}/cdltestfiles -${CMAKE_CURRENT_SOURCE_DIR}/rawtestfiles -${CMAKE_CURRENT_SOURCE_DIR}/baseline -${CMAKE_CURRENT_SOURCE_DIR}/baselineraw -${CMAKE_CURRENT_SOURCE_DIR}/baselineremote -#${CMAKE_CURRENT_SOURCE_DIR}/baselinerthredds -${CMAKE_CURRENT_SOURCE_DIR}/baselinehyrax -) -SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am) -ADD_EXTRA_DIST("${CUR_EXTRA_DIST}") + From 84af03eaa2345a8e4a51b65b6babef20906da89e Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 13 Oct 2023 11:32:27 -0600 Subject: [PATCH 3/5] Working on the last few s3 issues currently manifesting using S3_INTERNAL and WITH_S3_TESTING on Windows and MSYS2. --- libdispatch/dpathmgr.c | 1 + nczarr_test/run_interop.sh | 4 ++++ nczarr_test/run_notzarr.sh | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c index 14a6bb1a6e..dca9f7f80f 100644 --- a/libdispatch/dpathmgr.c +++ b/libdispatch/dpathmgr.c @@ -168,6 +168,7 @@ NCpathcvt(const char* inpath) } nullfree(tmp1); clearPath(&inparsed); + //fprintf(stderr,">>> ncpathcvt: inpath=%s result=%s\n",inpath,result); return result; } diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh index 3579c37384..5f85e6b0cd 100755 --- a/nczarr_test/run_interop.sh +++ b/nczarr_test/run_interop.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh @@ -43,6 +45,7 @@ testcasezip() { } testcases3() { + set -x echo -e "\to Running S3 Testcase:\t$1\t$2" zext=s3 base=$1 @@ -53,6 +56,7 @@ testcases3() { ${NCDUMP} -v "/group_with_dims/var2D" $flags $url > tmp_${base}_${zext}.cdl # Find the proper ref file diff -b ${ISOPATH}/ref_${base}_2d.cdl tmp_${base}_${zext}.cdl + set +x } testallcases() { diff --git a/nczarr_test/run_notzarr.sh b/nczarr_test/run_notzarr.sh index 7eb8a01ac1..86bd570dab 100755 --- a/nczarr_test/run_notzarr.sh +++ b/nczarr_test/run_notzarr.sh @@ -1,5 +1,6 @@ #!/bin/sh - +#set -x +#set -e if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh @@ -29,7 +30,7 @@ cp ${srcdir}/ref_notzarr.tar.gz . gunzip ref_notzarr.tar.gz tar -xf ref_notzarr.tar if test "x$FEATURE_S3TESTS" = xyes ; then - ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "/${S3ISOPATH}/notzarr.s3/notzarr.txt" upload + ${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "//${S3ISOPATH}/notzarr.s3/notzarr.txt" upload fi echo "Test empty file" From 4bd9c2e8b041c5fb08c1819b8cc6efaaea01f502 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 13 Oct 2023 15:02:58 -0600 Subject: [PATCH 4/5] Removed leading slash on run_interop in nczarr_test. --- nczarr_test/run_interop.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh index 5f85e6b0cd..ed22197112 100755 --- a/nczarr_test/run_interop.sh +++ b/nczarr_test/run_interop.sh @@ -52,8 +52,9 @@ testcases3() { mode=$2 rm -f tmp_${base}_${zext}.cdl url="https://${UH}/${UB}/${base}.zarr#mode=${mode},s3" + echo "flags: $flags" # Dumping everything causes timeout so dump a single var - ${NCDUMP} -v "/group_with_dims/var2D" $flags $url > tmp_${base}_${zext}.cdl + ${NCDUMP} -v "group_with_dims/var2D" $flags $url > tmp_${base}_${zext}.cdl # Find the proper ref file diff -b ${ISOPATH}/ref_${base}_2d.cdl tmp_${base}_${zext}.cdl set +x From 54102a3cea32b31b2638a7e5afebad3f8f35c738 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 16 Oct 2023 14:30:43 -0600 Subject: [PATCH 5/5] Update path in s3sdk shell script unit test. --- unit_test/run_s3sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_test/run_s3sdk.sh b/unit_test/run_s3sdk.sh index 4589bcb5f6..18073e4570 100755 --- a/unit_test/run_s3sdk.sh +++ b/unit_test/run_s3sdk.sh @@ -14,7 +14,7 @@ isolate "testdir_uts3sdk" # Create an isolation path for S3; build on the isolation directory S3ISODIR="$ISODIR" S3ISOPATH="/${S3TESTSUBTREE}" -S3ISOPATH="${S3ISOPATH}/$S3ISODIR" +S3ISOPATH="/${S3ISOPATH}/$S3ISODIR" test_cleanup() { ${CMD} ${execdir}/../nczarr_test/s3util -u "${URL}" -k "${S3ISOPATH}" clear