Remove mock for mountutil tests

Signed-off-by: apostasie <[email protected]>

Author: apostasie

pkg/mountutil/mountutil_linux_test.go

@@ -22,15 +22,11 @@ import (
 	"testing"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
-	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/pkg/oci"
-
-	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
-	mocks "github.com/containerd/nerdctl/v2/pkg/mountutil/mountutilmock"
 )
 
 // TestParseVolumeOptions tests volume options are parsed as expected.
@@ -265,23 +261,6 @@ func TestProcessFlagV(t *testing.T) {
 		},
 	}
 
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockVolumeStore := mocks.NewMockVolumeStore(ctrl)
-	mockVolumeStore.
-		EXPECT().
-		Get(gomock.Any(), false).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "/test/volume", Size: 1024}, nil).
-		AnyTimes()
-	mockVolumeStore.
-		EXPECT().
-		Create(gomock.Any(), nil).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "/test/volume"}, nil).AnyTimes()
-
-	mockOs := mocks.NewMockOs(ctrl)
-	mockOs.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes()
-
 	for _, tt := range tests {
 		t.Run(tt.rawSpec, func(t *testing.T) {
 			processedVolSpec, err := ProcessFlagV(tt.rawSpec, mockVolumeStore, false)
@@ -347,16 +326,6 @@ func TestProcessFlagVAnonymousVolumes(t *testing.T) {
 		},
 	}
 
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockVolumeStore := mocks.NewMockVolumeStore(ctrl)
-	mockVolumeStore.
-		EXPECT().
-		Create(gomock.Any(), []string{}).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "/test/volume"}, nil).
-		AnyTimes()
-
 	for _, tt := range tests {
 		t.Run(tt.rawSpec, func(t *testing.T) {
 			processedVolSpec, err := ProcessFlagV(tt.rawSpec, mockVolumeStore, true)

pkg/mountutil/mountutil_test.go

@@ -0,0 +1,37 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package mountutil
+
+import (
+	"runtime"
+
+	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
+	"github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore"
+)
+
+type MockVolumeStore struct {
+	volumestore.VolumeStore
+}
+
+func (mv *MockVolumeStore) CreateWithoutLock(name string, labels []string) (*native.Volume, error) {
+	if runtime.GOOS == "windows" {
+		return &native.Volume{Name: "test_volume", Mountpoint: "C:\\test\\directory"}, nil
+	}
+	return &native.Volume{Name: "test_volume", Mountpoint: "/test/volume"}, nil
+}
+
+var mockVolumeStore = &MockVolumeStore{}

pkg/mountutil/mountutil_windows_test.go

@@ -22,12 +22,8 @@ import (
 	"testing"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
-	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
-
-	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
-	mocks "github.com/containerd/nerdctl/v2/pkg/mountutil/mountutilmock"
 )
 
 func TestParseVolumeOptions(t *testing.T) {
@@ -268,23 +264,6 @@ func TestProcessFlagV(t *testing.T) {
 		},
 	}
 
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockVolumeStore := mocks.NewMockVolumeStore(ctrl)
-	mockVolumeStore.
-		EXPECT().
-		Get(gomock.Any(), false).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "C:\\test\\directory", Size: 1024}, nil).
-		AnyTimes()
-	mockVolumeStore.
-		EXPECT().
-		Create(gomock.Any(), nil).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "C:\\test\\directory"}, nil).AnyTimes()
-
-	mockOs := mocks.NewMockOs(ctrl)
-	mockOs.EXPECT().Stat(gomock.Any()).Return(nil, nil).AnyTimes()
-
 	for _, tt := range tests {
 		t.Run(tt.rawSpec, func(t *testing.T) {
 			processedVolSpec, err := ProcessFlagV(tt.rawSpec, mockVolumeStore, true)
@@ -342,16 +321,6 @@ func TestProcessFlagVAnonymousVolumes(t *testing.T) {
 		},
 	}
 
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockVolumeStore := mocks.NewMockVolumeStore(ctrl)
-	mockVolumeStore.
-		EXPECT().
-		Create(gomock.Any(), []string{}).
-		Return(&native.Volume{Name: "test_volume", Mountpoint: "C:\\test\\directory"}, nil).
-		AnyTimes()
-
 	for _, tt := range tests {
 		t.Run(tt.rawSpec, func(t *testing.T) {
 			processedVolSpec, err := ProcessFlagV(tt.rawSpec, mockVolumeStore, true)