Commit 5f7b03e1 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by Yaya
Browse files

gitlab-container-registry: delete test in postPatch rather than with patch file

parent b2c5e1e4
Loading
Loading
Loading
Loading
+0 −38
Original line number Diff line number Diff line
From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 20 Jun 2023 10:01:23 +0000
Subject: [PATCH] Disable inmemory storage driver test

---
 .../storage/driver/inmemory/driver_test.go    | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 registry/storage/driver/inmemory/driver_test.go

diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go
deleted file mode 100644
index dbc1916f..00000000
--- a/registry/storage/driver/inmemory/driver_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package inmemory
-
-import (
-	"testing"
-
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/testsuites"
-	"gopkg.in/check.v1"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-func init() {
-	inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) {
-		return New(), nil
-	}
-	testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip)
-}
-- 
2.40.1
+3 −4
Original line number Diff line number Diff line
@@ -15,11 +15,10 @@ buildGoModule rec {

  vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4=";

  patches = [
    ./Disable-inmemory-storage-driver-test.patch
  ];

  postPatch = ''
    # Disable flaky inmemory storage driver test
    rm registry/storage/driver/inmemory/driver_test.go

    substituteInPlace health/checks/checks_test.go \
      --replace \
        'func TestHTTPChecker(t *testing.T) {' \