From 00619ef6cb93e4e982fe53efbf144dc68705515d Mon Sep 17 00:00:00 2001
From: OpenAI <noreply@openai.com>
Date: Wed, 10 Jun 2026 19:20:00 +0000
Subject: [PATCH] tests: expect NCP unlimited userquota sentinel

---
 tests/nwfs/nwfs_ncpfs_metadata_smoke.sh.in | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/nwfs/nwfs_ncpfs_metadata_smoke.sh.in b/tests/nwfs/nwfs_ncpfs_metadata_smoke.sh.in
index 5329e6b..cf8557b 100755
--- a/tests/nwfs/nwfs_ncpfs_metadata_smoke.sh.in
+++ b/tests/nwfs/nwfs_ncpfs_metadata_smoke.sh.in
@@ -40,6 +40,7 @@ USER_QUOTA_OBJECT=${NWFS_NCPFS_USER_QUOTA_OBJECT:-$TRUSTEE_OBJECT}
 USER_QUOTA_TYPE=${NWFS_NCPFS_USER_QUOTA_TYPE:-$TRUSTEE_TYPE}
 USER_QUOTA_EXPECT=${NWFS_NCPFS_USER_QUOTA_EXPECT:-auto}
 USER_QUOTA_HOST_USER=${NWFS_NCPFS_USER_QUOTA_HOST_USER:-}
+USER_QUOTA_UNLIMITED_4K=1073741824
 RIGHTS_MATRIX=${NWFS_NCPFS_RIGHTS_MATRIX:-R F RF W C E M A RWCEMFA S}
 RESET_TESTDIR=${NWFS_NCPFS_RESET_TESTDIR:-1}
 HOST_RESET_TESTDIR=${NWFS_NCPFS_HOST_RESET_TESTDIR:-1}
@@ -421,15 +422,22 @@ if [ -n "$USER_QUOTA_4K" ]; then
         "$USERQUOTA_HELPER" -S "$SERVER" -U "$USER" -P "$PASSWORD" \
             --volume "$VOLUME" --object "$USER_QUOTA_OBJECT" --type "$USER_QUOTA_TYPE" \
             --remove | tee "$USERQUOTA_OUT"
-        if ! grep -q "restriction4k=0" "$USERQUOTA_OUT"; then
-            echo "user quota helper did not read back restriction4k=0 after remove" >&2
+        if ! grep -q "restriction4k=$USER_QUOTA_UNLIMITED_4K" "$USERQUOTA_OUT"; then
+            echo "user quota helper did not read back unrestricted restriction4k=$USER_QUOTA_UNLIMITED_4K after remove" >&2
             exit 1
         fi
         sync
         printf '\n# after user quota remove\n'
         "$DUMP" "$SYSROOT" | tee "$USERQUOTA_DUMP"
-        if [ "$USER_QUOTA_EXPECT" = metadata ] && grep -q "restriction=$USER_QUOTA_4K" "$USERQUOTA_DUMP"; then
-            echo "netware.userquota still contains removed restriction=$USER_QUOTA_4K" >&2
+        if [ "$USER_QUOTA_EXPECT" = metadata ]; then
+            if ! grep -q "netware.userquota: .*validate=0" "$USERQUOTA_DUMP" || \
+               ! grep -q "restriction=$USER_QUOTA_UNLIMITED_4K" "$USERQUOTA_DUMP"; then
+                echo "expected netware.userquota unrestricted restriction=$USER_QUOTA_UNLIMITED_4K after remove" >&2
+                exit 1
+            fi
+        elif [ "$USER_QUOTA_EXPECT" = auto ] && grep -q "netware.userquota: .*validate=0" "$USERQUOTA_DUMP" && \
+             ! grep -q "restriction=$USER_QUOTA_UNLIMITED_4K" "$USERQUOTA_DUMP"; then
+            echo "netware.userquota is present but expected unrestricted restriction=$USER_QUOTA_UNLIMITED_4K after remove" >&2
             exit 1
         fi
     else