From 3e4145faf1ca4d893771032fb31eafb94f58c201 Mon Sep 17 00:00:00 2001 From: Paul Okstad Date: Tue, 3 Nov 2020 21:32:43 -0800 Subject: Incorporate new testhelper in resolve conflicts tests --- .../service/conflicts/resolve_conflicts_test.go | 48 ++++------------------ 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 81218423c..d191dcd2a 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -29,19 +29,9 @@ var ( ) func TestSuccessfulResolveConflictsRequest(t *testing.T) { - featureSets, err := testhelper.NewFeatureSets([]featureflag.FeatureFlag{featureflag.GoResolveConflicts}) - require.NoError(t, err) - for _, featureSet := range featureSets { - t.Run("disabled "+featureSet.String(), func(t *testing.T) { - ctx, cancel := testhelper.Context() - defer cancel() - - ctx = featureSet.Disable(ctx) - require.True(t, featureflag.IsEnabled(ctx, featureflag.GoResolveConflicts)) - - testSuccessfulResolveConflictsRequest(t, ctx) - }) - } + testhelper.NewFeatureSets( + []featureflag.FeatureFlag{featureflag.GoResolveConflicts}, + ).Run(t, testSuccessfulResolveConflictsRequest) } func testSuccessfulResolveConflictsRequest(t *testing.T, ctx context.Context) { @@ -128,19 +118,9 @@ func testSuccessfulResolveConflictsRequest(t *testing.T, ctx context.Context) { } func TestFailedResolveConflictsRequestDueToResolutionError(t *testing.T) { - featureSets, err := testhelper.NewFeatureSets([]featureflag.FeatureFlag{featureflag.GoResolveConflicts}) - require.NoError(t, err) - for _, featureSet := range featureSets { - t.Run("disabled "+featureSet.String(), func(t *testing.T) { - ctx, cancel := testhelper.Context() - defer cancel() - - ctx = featureSet.Disable(ctx) - require.True(t, featureflag.IsEnabled(ctx, featureflag.GoResolveConflicts)) - - testFailedResolveConflictsRequestDueToResolutionError(t, ctx) - }) - } + testhelper.NewFeatureSets( + []featureflag.FeatureFlag{featureflag.GoResolveConflicts}, + ).Run(t, testFailedResolveConflictsRequestDueToResolutionError) } func testFailedResolveConflictsRequestDueToResolutionError(t *testing.T, ctx context.Context) { @@ -205,19 +185,9 @@ func testFailedResolveConflictsRequestDueToResolutionError(t *testing.T, ctx con } func TestFailedResolveConflictsRequestDueToValidation(t *testing.T) { - featureSets, err := testhelper.NewFeatureSets([]featureflag.FeatureFlag{featureflag.GoResolveConflicts}) - require.NoError(t, err) - for _, featureSet := range featureSets { - t.Run("disabled "+featureSet.String(), func(t *testing.T) { - ctx, cancel := testhelper.Context() - defer cancel() - - ctx = featureSet.Disable(ctx) - require.True(t, featureflag.IsEnabled(ctx, featureflag.GoResolveConflicts)) - - testFailedResolveConflictsRequestDueToValidation(t, ctx) - }) - } + testhelper.NewFeatureSets( + []featureflag.FeatureFlag{featureflag.GoResolveConflicts}, + ).Run(t, testFailedResolveConflictsRequestDueToValidation) } func testFailedResolveConflictsRequestDueToValidation(t *testing.T, ctx context.Context) { -- cgit v1.2.3