testsuite: update storj.io/storj dependency to latest, fix test

Change-Id: I56fb7f0e7c273256ec112cd541747725455cc92c
storj · Sep 28, 2023 · 5e63b72 · 5e63b72
1 parent 4763dac
commit 5e63b72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/testsuite/go.mod b/testsuite/go.mod
@@ -12,7 +12,7 @@ require (
 	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
 	storj.io/common v0.0.0-20230920095429-0ce0a575e6f8
 	storj.io/drpc v0.0.33
-	storj.io/storj v0.12.1-0.20230920100647-22261146bef9
+	storj.io/storj v0.12.1-0.20230928053853-31d42bb136fe
 	storj.io/uplink v1.12.1-0.20230915133208-3b7b92a826a3
 )
 

diff --git a/testsuite/go.sum b/testsuite/go.sum
@@ -902,5 +902,5 @@ storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c h1:or/DtG5uaZpzimL61ahlgAA
 storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c/go.mod h1:JCuc3C0gzCJHQ4J6SOx/Yjg+QTpX0D+Fvs5H46FETCk=
 storj.io/private v0.0.0-20230912093002-ca2d4ab44679 h1:58rShZRrm14tDqc71bnyoFZDvdNIcJ7iBwQWEQZl60U=
 storj.io/private v0.0.0-20230912093002-ca2d4ab44679/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4=
-storj.io/storj v0.12.1-0.20230920100647-22261146bef9 h1:7T0K0G0Sq8S+jv/nesQnXkTXnYDpjKsteiSBGnNQdzk=
-storj.io/storj v0.12.1-0.20230920100647-22261146bef9/go.mod h1:5mf9sC6zB8Aaq5+pRDThbrdO7DrLI9ILHx8oqbFDwSk=
+storj.io/storj v0.12.1-0.20230928053853-31d42bb136fe h1:SEbuP3bteR04uudX6rQtktdt+2wi0ERrv5jYlb6oEK0=
+storj.io/storj v0.12.1-0.20230928053853-31d42bb136fe/go.mod h1:sVBt64az1Va9oR07naE2YKnp20kIwoEG69OSZcwvI4M=
diff --git a/testsuite/private/bucket/buckets_test.go b/testsuite/private/bucket/buckets_test.go
@@ -71,16 +71,14 @@ func TestListBucketsWithAttribution(t *testing.T) {
 }
 
 func TestGetBucketLocation(t *testing.T) {
-	placementRules := overlay.NewPlacementRules()
-	err := placementRules.AddPlacementFromString(fmt.Sprintf(`40:annotated(annotated(country("PL"),annotation("%s","Poland")),annotation("%s","%s"))`,
-		nodeselection.Location, nodeselection.AutoExcludeSubnet, nodeselection.AutoExcludeSubnetOFF))
-	require.NoError(t, err)
-
 	testplanet.Run(t, testplanet.Config{
 		SatelliteCount: 1, UplinkCount: 1,
 		Reconfigure: testplanet.Reconfigure{
 			Satellite: func(log *zap.Logger, index int, config *satellite.Config) {
-				config.Placement = *placementRules
+				config.Placement = overlay.ConfigurablePlacementRule{
+					PlacementRules: fmt.Sprintf(`40:annotated(annotated(country("PL"),annotation("%s","Poland")),annotation("%s","%s"))`,
+						nodeselection.Location, nodeselection.AutoExcludeSubnet, nodeselection.AutoExcludeSubnetOFF),
+				}
 			},
 		},
 	}, func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet) {