diff --git a/test/volume_server/framework/cluster_interface.go b/test/volume_server/framework/cluster_interface.go new file mode 100644 index 000000000..981867838 --- /dev/null +++ b/test/volume_server/framework/cluster_interface.go @@ -0,0 +1,34 @@ +package framework + +import ( + "os" + "testing" + + "github.com/seaweedfs/seaweedfs/test/volume_server/matrix" +) + +// TestCluster is the common interface for single-volume cluster harnesses. +// Both *Cluster (Go volume) and *RustCluster (Rust volume) satisfy it. +type TestCluster interface { + MasterAddress() string + VolumeAdminAddress() string + VolumePublicAddress() string + VolumeGRPCAddress() string + VolumeServerAddress() string + MasterURL() string + VolumeAdminURL() string + VolumePublicURL() string + BaseDir() string + Stop() +} + +// StartVolumeCluster starts a single-volume cluster using either the Go or +// Rust volume server, depending on the VOLUME_SERVER_IMPL environment variable. +// Set VOLUME_SERVER_IMPL=rust to use the Rust volume server. +func StartVolumeCluster(t testing.TB, profile matrix.Profile) TestCluster { + t.Helper() + if os.Getenv("VOLUME_SERVER_IMPL") == "rust" { + return StartRustVolumeCluster(t, profile) + } + return StartSingleVolumeCluster(t, profile) +} diff --git a/test/volume_server/grpc/admin_extra_test.go b/test/volume_server/grpc/admin_extra_test.go index de62fcdb8..4273a2c92 100644 --- a/test/volume_server/grpc/admin_extra_test.go +++ b/test/volume_server/grpc/admin_extra_test.go @@ -18,7 +18,7 @@ func TestVolumeNeedleStatusForUploadedFile(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -62,7 +62,7 @@ func TestVolumeNeedleStatusViaEcShardsWhenNormalVolumeUnmounted(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -138,7 +138,7 @@ func TestVolumeNeedleStatusMissingVolumeAndNeedle(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -185,7 +185,7 @@ func TestVolumeConfigureInvalidReplication(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -215,7 +215,7 @@ func TestVolumeConfigureSuccessAndMissingRollbackPath(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -268,7 +268,7 @@ func TestPingVolumeTargetAndLeaveAffectsHealthz(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -311,7 +311,7 @@ func TestVolumeServerLeaveIsIdempotent(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -346,7 +346,7 @@ func TestPingUnknownAndUnreachableTargetPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -395,7 +395,7 @@ func TestPingMasterTargetSuccess(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/admin_lifecycle_test.go b/test/volume_server/grpc/admin_lifecycle_test.go index bdc4e5a45..7ec5d64ef 100644 --- a/test/volume_server/grpc/admin_lifecycle_test.go +++ b/test/volume_server/grpc/admin_lifecycle_test.go @@ -19,7 +19,7 @@ func TestVolumeAdminLifecycleRPCs(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -62,7 +62,7 @@ func TestVolumeDeleteOnlyEmptyVariants(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -101,7 +101,7 @@ func TestMaintenanceModeRejectsAllocateVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -133,7 +133,7 @@ func TestAllocateDuplicateAndMountUnmountMissingVariants(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -184,7 +184,7 @@ func TestMaintenanceModeRejectsVolumeDelete(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/admin_readonly_collection_test.go b/test/volume_server/grpc/admin_readonly_collection_test.go index 621309729..bc51f99b5 100644 --- a/test/volume_server/grpc/admin_readonly_collection_test.go +++ b/test/volume_server/grpc/admin_readonly_collection_test.go @@ -16,7 +16,7 @@ func TestVolumeMarkReadonlyAndWritableLifecycle(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -61,7 +61,7 @@ func TestVolumeMarkReadonlyPersistTrue(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -93,7 +93,7 @@ func TestVolumeMarkReadonlyWritableErrorPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -140,7 +140,7 @@ func TestDeleteCollectionRemovesVolumeAndIsIdempotent(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/batch_delete_test.go b/test/volume_server/grpc/batch_delete_test.go index b02d4ea27..4fc822fee 100644 --- a/test/volume_server/grpc/batch_delete_test.go +++ b/test/volume_server/grpc/batch_delete_test.go @@ -18,7 +18,7 @@ func TestBatchDeleteInvalidFidAndMaintenanceMode(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -61,7 +61,7 @@ func TestBatchDeleteCookieMismatchAndSkipCheck(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -124,7 +124,7 @@ func TestBatchDeleteMixedStatusesAndMismatchStopsProcessing(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -219,7 +219,7 @@ func TestBatchDeleteRejectsChunkManifestNeedles(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/copy_receive_variants_test.go b/test/volume_server/grpc/copy_receive_variants_test.go index 14d9cee72..d9d70c28a 100644 --- a/test/volume_server/grpc/copy_receive_variants_test.go +++ b/test/volume_server/grpc/copy_receive_variants_test.go @@ -18,7 +18,7 @@ func TestVolumeIncrementalCopyDataAndNoDataPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -77,7 +77,7 @@ func TestCopyFileIgnoreNotFoundAndStopOffsetZeroPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -137,7 +137,7 @@ func TestCopyFileCompactionRevisionMismatch(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -166,7 +166,7 @@ func TestReceiveFileProtocolViolationResponses(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -213,7 +213,7 @@ func TestReceiveFileSuccessForRegularVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -299,7 +299,7 @@ func TestReceiveFileSuccessForEcVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -389,7 +389,7 @@ func TestCopyFileEcVolumeIgnoreMissingSourcePaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/copy_sync_test.go b/test/volume_server/grpc/copy_sync_test.go index 3c2916fd0..9678efe4b 100644 --- a/test/volume_server/grpc/copy_sync_test.go +++ b/test/volume_server/grpc/copy_sync_test.go @@ -18,7 +18,7 @@ func TestVolumeSyncStatusAndReadVolumeFileStatus(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -53,7 +53,7 @@ func TestCopyAndStreamMethodsMissingVolumePaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -100,7 +100,7 @@ func TestVolumeCopyAndReceiveFileMaintenanceRejection(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/data_rw_test.go b/test/volume_server/grpc/data_rw_test.go index 43969532d..b7701b9b2 100644 --- a/test/volume_server/grpc/data_rw_test.go +++ b/test/volume_server/grpc/data_rw_test.go @@ -16,7 +16,7 @@ func TestReadNeedleBlobAndMetaMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -54,7 +54,7 @@ func TestWriteNeedleBlobMaintenanceAndMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -104,7 +104,7 @@ func TestReadNeedleBlobAndMetaInvalidOffsets(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/data_stream_success_test.go b/test/volume_server/grpc/data_stream_success_test.go index 90f2a8248..1f54c1900 100644 --- a/test/volume_server/grpc/data_stream_success_test.go +++ b/test/volume_server/grpc/data_stream_success_test.go @@ -19,7 +19,7 @@ func TestReadWriteNeedleBlobAndMetaRoundTrip(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -122,7 +122,7 @@ func TestReadAllNeedlesStreamsUploadedRecords(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -180,7 +180,7 @@ func TestReadAllNeedlesExistingThenMissingVolumeAbortsStream(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/erasure_coding_test.go b/test/volume_server/grpc/erasure_coding_test.go index 8a0d8f75f..f5852c6f3 100644 --- a/test/volume_server/grpc/erasure_coding_test.go +++ b/test/volume_server/grpc/erasure_coding_test.go @@ -23,7 +23,7 @@ func TestEcMaintenanceModeRejections(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -92,7 +92,7 @@ func TestEcMissingInvalidAndNoopPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -199,7 +199,7 @@ func TestEcGenerateMountInfoUnmountLifecycle(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -268,7 +268,7 @@ func TestEcShardReadAndBlobDeleteLifecycle(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -369,7 +369,7 @@ func TestEcRebuildMissingShardLifecycle(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -449,7 +449,7 @@ func TestEcShardsToVolumeMissingShardAndNoLiveEntries(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -560,7 +560,7 @@ func TestEcShardsToVolumeSuccessRoundTrip(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -621,7 +621,7 @@ func TestEcShardsDeleteLastShardRemovesEcx(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -757,7 +757,7 @@ func TestEcShardsCopyFailsWhenSourceUnavailable(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/health_state_test.go b/test/volume_server/grpc/health_state_test.go index cac40731b..16f4627e6 100644 --- a/test/volume_server/grpc/health_state_test.go +++ b/test/volume_server/grpc/health_state_test.go @@ -16,7 +16,7 @@ func TestStateAndStatusRPCs(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -94,7 +94,7 @@ func TestSetStateVersionMismatchAndNilStateNoop(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, client := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/scrub_query_test.go b/test/volume_server/grpc/scrub_query_test.go index 46b67e0ca..398373c80 100644 --- a/test/volume_server/grpc/scrub_query_test.go +++ b/test/volume_server/grpc/scrub_query_test.go @@ -17,7 +17,7 @@ func TestScrubVolumeIndexAndUnsupportedMode(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -55,7 +55,7 @@ func TestScrubEcVolumeMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -79,7 +79,7 @@ func TestScrubEcVolumeAutoSelectNoEcVolumes(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -105,7 +105,7 @@ func TestQueryInvalidAndMissingFileIDPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -149,7 +149,7 @@ func TestScrubVolumeAutoSelectAndAllModes(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -210,7 +210,7 @@ func TestQueryJsonSuccessAndCsvNoOutput(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -285,7 +285,7 @@ func TestQueryJsonNoMatchReturnsEmptyStripe(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -341,7 +341,7 @@ func TestQueryCookieMismatchReturnsEOFNoResults(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/tail_test.go b/test/volume_server/grpc/tail_test.go index 09657edb5..599450794 100644 --- a/test/volume_server/grpc/tail_test.go +++ b/test/volume_server/grpc/tail_test.go @@ -19,7 +19,7 @@ func TestVolumeTailSenderMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -40,7 +40,7 @@ func TestVolumeTailSenderHeartbeatThenEOF(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -78,7 +78,7 @@ func TestVolumeTailReceiverMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -144,7 +144,7 @@ func TestVolumeTailSenderLargeNeedleChunking(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/tiering_remote_test.go b/test/volume_server/grpc/tiering_remote_test.go index db36e7cfd..472aa1255 100644 --- a/test/volume_server/grpc/tiering_remote_test.go +++ b/test/volume_server/grpc/tiering_remote_test.go @@ -17,7 +17,7 @@ func TestFetchAndWriteNeedleMaintenanceAndMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -60,7 +60,7 @@ func TestFetchAndWriteNeedleInvalidRemoteConfig(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -94,7 +94,7 @@ func TestVolumeTierMoveDatToRemoteErrorPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -161,7 +161,7 @@ func TestVolumeTierMoveDatToRemoteMissingBackend(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -190,7 +190,7 @@ func TestVolumeTierMoveDatFromRemoteErrorPaths(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/grpc/vacuum_test.go b/test/volume_server/grpc/vacuum_test.go index ea986fed2..deb8c298d 100644 --- a/test/volume_server/grpc/vacuum_test.go +++ b/test/volume_server/grpc/vacuum_test.go @@ -16,7 +16,7 @@ func TestVacuumVolumeCheckSuccessAndMissingVolume(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -45,7 +45,7 @@ func TestVacuumMaintenanceModeRejections(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/admin_test.go b/test/volume_server/http/admin_test.go index be4445ebc..6d2262832 100644 --- a/test/volume_server/http/admin_test.go +++ b/test/volume_server/http/admin_test.go @@ -16,7 +16,7 @@ func TestAdminStatusAndHealthz(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) client := framework.NewHTTPClient() statusReq, err := http.NewRequest(http.MethodGet, cluster.VolumeAdminURL()+"/status", nil) @@ -77,7 +77,7 @@ func TestOptionsMethodsByPort(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P2()) + cluster := framework.StartVolumeCluster(t, matrix.P2()) client := framework.NewHTTPClient() adminResp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodOptions, cluster.VolumeAdminURL()+"/")) @@ -117,7 +117,7 @@ func TestOptionsWithOriginIncludesCorsHeaders(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P2()) + cluster := framework.StartVolumeCluster(t, matrix.P2()) client := framework.NewHTTPClient() adminReq := mustNewRequest(t, http.MethodOptions, cluster.VolumeAdminURL()+"/") @@ -154,7 +154,7 @@ func TestUiIndexNotExposedWhenJwtSigningEnabled(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P3()) + cluster := framework.StartVolumeCluster(t, matrix.P3()) client := framework.NewHTTPClient() resp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodGet, cluster.VolumeAdminURL()+"/ui/index.html")) diff --git a/test/volume_server/http/auth_test.go b/test/volume_server/http/auth_test.go index 5b093bba1..fc2fb3f16 100644 --- a/test/volume_server/http/auth_test.go +++ b/test/volume_server/http/auth_test.go @@ -18,7 +18,7 @@ func TestJWTAuthForWriteAndRead(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -81,7 +81,7 @@ func TestJWTAuthRejectsFidMismatch(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -161,7 +161,7 @@ func TestJWTAuthRejectsExpiredTokens(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -209,7 +209,7 @@ func TestJWTAuthViaQueryParamAndCookie(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -249,7 +249,7 @@ func TestJWTTokenSourcePrecedenceQueryOverHeader(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -299,7 +299,7 @@ func TestJWTTokenSourcePrecedenceHeaderOverCookie(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -345,7 +345,7 @@ func TestJWTTokenSourcePrecedenceQueryOverCookie(t *testing.T) { } profile := matrix.P3() - clusterHarness := framework.StartSingleVolumeCluster(t, profile) + clusterHarness := framework.StartVolumeCluster(t, profile) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/chunk_manifest_test.go b/test/volume_server/http/chunk_manifest_test.go index d3806d7f4..c8ae6cd92 100644 --- a/test/volume_server/http/chunk_manifest_test.go +++ b/test/volume_server/http/chunk_manifest_test.go @@ -16,7 +16,7 @@ func TestChunkManifestExpansionAndBypass(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -97,7 +97,7 @@ func TestChunkManifestDeleteRemovesChildChunks(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -174,7 +174,7 @@ func TestChunkManifestDeleteFailsWhenChildDeletionFails(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/compressed_read_test.go b/test/volume_server/http/compressed_read_test.go index 8a9ac5c41..0101a20c0 100644 --- a/test/volume_server/http/compressed_read_test.go +++ b/test/volume_server/http/compressed_read_test.go @@ -43,7 +43,7 @@ func TestCompressedReadAcceptEncodingMatrix(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/headers_static_test.go b/test/volume_server/http/headers_static_test.go index 5b4a2fd93..36bbade8b 100644 --- a/test/volume_server/http/headers_static_test.go +++ b/test/volume_server/http/headers_static_test.go @@ -15,7 +15,7 @@ func TestReadPassthroughHeadersAndDownloadDisposition(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -64,7 +64,7 @@ func TestStaticAssetEndpoints(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) client := framework.NewHTTPClient() faviconResp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodGet, clusterHarness.VolumeAdminURL()+"/favicon.ico")) @@ -85,7 +85,7 @@ func TestStaticAssetEndpointsOnPublicPort(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) client := framework.NewHTTPClient() faviconResp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodGet, clusterHarness.VolumePublicURL()+"/favicon.ico")) diff --git a/test/volume_server/http/image_transform_test.go b/test/volume_server/http/image_transform_test.go index 222fc951f..a94eba1a2 100644 --- a/test/volume_server/http/image_transform_test.go +++ b/test/volume_server/http/image_transform_test.go @@ -45,7 +45,7 @@ func TestImageResizeAndCropReadVariants(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/public_cors_methods_test.go b/test/volume_server/http/public_cors_methods_test.go index 5328b9a8b..b28c23ddb 100644 --- a/test/volume_server/http/public_cors_methods_test.go +++ b/test/volume_server/http/public_cors_methods_test.go @@ -15,7 +15,7 @@ func TestPublicPortReadOnlyMethodBehavior(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -70,7 +70,7 @@ func TestCorsAndUnsupportedMethodBehavior(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -133,7 +133,7 @@ func TestUnsupportedMethodTraceParity(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -168,7 +168,7 @@ func TestUnsupportedMethodPropfindParity(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -212,7 +212,7 @@ func TestUnsupportedMethodConnectParity(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -256,7 +256,7 @@ func TestPublicPortHeadReadParity(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P2()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P2()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/range_variants_test.go b/test/volume_server/http/range_variants_test.go index 2e1f5e286..71ffb6dff 100644 --- a/test/volume_server/http/range_variants_test.go +++ b/test/volume_server/http/range_variants_test.go @@ -14,7 +14,7 @@ func TestMultiRangeReadReturnsMultipartPayload(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -52,7 +52,7 @@ func TestOversizedCombinedRangesAreIgnored(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/read_deleted_test.go b/test/volume_server/http/read_deleted_test.go index 23d400e23..b2db65d70 100644 --- a/test/volume_server/http/read_deleted_test.go +++ b/test/volume_server/http/read_deleted_test.go @@ -13,7 +13,7 @@ func TestReadDeletedQueryReturnsDeletedNeedleData(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/read_path_variants_test.go b/test/volume_server/http/read_path_variants_test.go index 97a7ac628..eac72079a 100644 --- a/test/volume_server/http/read_path_variants_test.go +++ b/test/volume_server/http/read_path_variants_test.go @@ -15,7 +15,7 @@ func TestReadPathShapesAndIfModifiedSince(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -85,7 +85,7 @@ func TestMalformedVidFidPathReturnsBadRequest(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) client := framework.NewHTTPClient() resp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodGet, clusterHarness.VolumeAdminURL()+"/not-a-vid/not-a-fid")) @@ -100,7 +100,7 @@ func TestReadWrongCookieReturnsNotFound(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -139,7 +139,7 @@ func TestConditionalHeaderPrecedenceAndInvalidIfModifiedSince(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/read_write_delete_test.go b/test/volume_server/http/read_write_delete_test.go index b122d697c..b26c4f661 100644 --- a/test/volume_server/http/read_write_delete_test.go +++ b/test/volume_server/http/read_write_delete_test.go @@ -14,7 +14,7 @@ func TestUploadReadRangeHeadDeleteRoundTrip(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress()) defer conn.Close() @@ -112,7 +112,7 @@ func TestInvalidReadPathReturnsBadRequest(t *testing.T) { t.Skip("skipping integration test in short mode") } - cluster := framework.StartSingleVolumeCluster(t, matrix.P1()) + cluster := framework.StartVolumeCluster(t, matrix.P1()) client := framework.NewHTTPClient() resp := framework.DoRequest(t, client, mustNewRequest(t, http.MethodGet, cluster.VolumeAdminURL()+"/invalid,needle")) diff --git a/test/volume_server/http/throttling_test.go b/test/volume_server/http/throttling_test.go index 7a66e9ebb..e07c441d8 100644 --- a/test/volume_server/http/throttling_test.go +++ b/test/volume_server/http/throttling_test.go @@ -60,7 +60,7 @@ func TestUploadLimitTimeoutAndReplicateBypass(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -143,7 +143,7 @@ func TestUploadLimitWaitThenProceed(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -226,7 +226,7 @@ func TestUploadLimitTimeoutThenRecovery(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -289,7 +289,7 @@ func TestDownloadLimitTimeoutReturnsTooManyRequests(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -336,7 +336,7 @@ func TestDownloadLimitWaitThenProceedWithoutReplica(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -398,7 +398,7 @@ func TestDownloadLimitTimeoutThenRecovery(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -593,7 +593,7 @@ func TestUploadLimitDisabledAllowsConcurrentUploads(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -646,7 +646,7 @@ func TestDownloadLimitDisabledAllowsConcurrentDownloads(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -691,7 +691,7 @@ func TestDownloadLimitInvalidVidWhileOverLimitReturnsBadRequest(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P8()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P8()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/write_delete_variants_test.go b/test/volume_server/http/write_delete_variants_test.go index 3355e7778..6a017299e 100644 --- a/test/volume_server/http/write_delete_variants_test.go +++ b/test/volume_server/http/write_delete_variants_test.go @@ -14,7 +14,7 @@ func TestWriteUnchangedAndDeleteEdgeVariants(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() @@ -71,7 +71,7 @@ func TestDeleteTimestampOverrideKeepsReadDeletedLastModifiedParity(t *testing.T) t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close() diff --git a/test/volume_server/http/write_error_variants_test.go b/test/volume_server/http/write_error_variants_test.go index ead11ed6c..2f858b41b 100644 --- a/test/volume_server/http/write_error_variants_test.go +++ b/test/volume_server/http/write_error_variants_test.go @@ -14,7 +14,7 @@ func TestWriteInvalidVidAndFidReturnBadRequest(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) client := framework.NewHTTPClient() invalidVidReq := newUploadRequest(t, clusterHarness.VolumeAdminURL()+"/invalid,12345678", []byte("x")) @@ -37,7 +37,7 @@ func TestWriteMalformedMultipartAndMD5Mismatch(t *testing.T) { t.Skip("skipping integration test in short mode") } - clusterHarness := framework.StartSingleVolumeCluster(t, matrix.P1()) + clusterHarness := framework.StartVolumeCluster(t, matrix.P1()) conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress()) defer conn.Close()