objstorageprovider: improve "open" test directive

Make the creator-id an optional key-value.

Author: RaduBerinde

objstorage/objstorageprovider/provider_test.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"math/rand/v2"
+	"slices"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -64,7 +65,17 @@ func TestProvider(t *testing.T) {
 			case "open":
 				var fsDir string
 				var creatorID objstorage.CreatorID
-				scanArgs("<fs-dir> <remote-creator-id>", &fsDir, &creatorID)
+				d.CmdArgs = slices.DeleteFunc(d.CmdArgs, func(arg datadriven.CmdArg) bool {
+					switch arg.Key {
+					case "creator-id":
+						var id uint64
+						arg.Scan(t, 0, &id)
+						creatorID = objstorage.CreatorID(id)
+						return true
+					}
+					return false
+				})
+				scanArgs("<fs-dir> [creator-id=X]", &fsDir)
 
 				st := DefaultSettings(fs, fsDir)
 				if creatorID != 0 {

objstorage/objstorageprovider/testdata/provider/local

@@ -1,6 +1,6 @@
 # Basic provider tests without shared storage.
 
-open p0 0
+open p0
 ----
 <local fs> mkdir-all: p0 0755
 <local fs> open-dir: p0

objstorage/objstorageprovider/testdata/provider/local_readahead

@@ -1,4 +1,4 @@
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1

objstorage/objstorageprovider/testdata/provider/shared_attach

@@ -1,7 +1,7 @@
 # Basic tests for obtaining the backing of shared objects and attaching them to
 # another provider.
 
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -70,7 +70,7 @@ close
 <local fs> close: p1/REMOTE-OBJ-CATALOG-000001
 <local fs> close: p1
 
-open p2 2
+open p2 creator-id=2
 ----
 <local fs> mkdir-all: p2 0755
 <local fs> open-dir: p2

objstorage/objstorageprovider/testdata/provider/shared_attach_after_unref

@@ -1,6 +1,6 @@
 # Tests when an object is unrefed before it is attached to another provider.
 
-open p5 5
+open p5 creator-id=5
 ----
 <local fs> mkdir-all: p5 0755
 <local fs> open-dir: p5
@@ -27,7 +27,7 @@ save-backing p5b1 1
 remove 1
 ----
 
-open p6 6
+open p6 creator-id=6
 ----
 <local fs> mkdir-all: p6 0755
 <local fs> open-dir: p6

objstorage/objstorageprovider/testdata/provider/shared_attach_multi

@@ -1,6 +1,6 @@
 # Tests with the same shared object attached as multiple objects.
 
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -23,7 +23,7 @@ create 1 shared 1 100
 save-backing b1 1
 ----
 
-open p2 2
+open p2 creator-id=2
 ----
 <local fs> mkdir-all: p2 0755
 <local fs> open-dir: p2

objstorage/objstorageprovider/testdata/provider/shared_basic

@@ -1,7 +1,6 @@
 # Basic provider tests with shared storage.
 
-# open <fs-dir> <creator-id>
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -60,7 +59,7 @@ close
 <local fs> close: p1
 
 # Test that the objects are there on re-open.
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1

objstorage/objstorageprovider/testdata/provider/shared_no_ref

@@ -1,7 +1,6 @@
 # Tests with shared storage when ref tracking is disabled.
 
-# open <fs-dir> <creator-id>
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -73,7 +72,7 @@ close
 <local fs> close: p1
 
 # Test that the objects are there on re-open.
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -120,7 +119,7 @@ save-backing b1 1
 save-backing b2 1
 ----
 
-open p2 2
+open p2 creator-id=2
 ----
 <local fs> mkdir-all: p2 0755
 <local fs> open-dir: p2

objstorage/objstorageprovider/testdata/provider/shared_readahead

@@ -1,4 +1,4 @@
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1

objstorage/objstorageprovider/testdata/provider/shared_remove

@@ -1,4 +1,4 @@
-open p1 1
+open p1 creator-id=1
 ----
 <local fs> mkdir-all: p1 0755
 <local fs> open-dir: p1
@@ -38,7 +38,7 @@ save-backing b1 1
 save-backing b2 2
 ----
 
-open p2 2
+open p2 creator-id=2
 ----
 <local fs> mkdir-all: p2 0755
 <local fs> open-dir: p2