From d0c961a5c9b6ec9b7422722c3dc0e402507b9582 Mon Sep 17 00:00:00 2001 From: Eddie Torres Date: Mon, 10 Oct 2022 15:21:27 +0000 Subject: [PATCH] Update and run update-gomock Signed-off-by: Eddie Torres --- .github/workflows/unit-tests.yaml | 5 ++++- hack/update-gomock | 2 ++ pkg/mounter/mock_mount_windows.go | 30 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 9fc382734f..63483dcf2f 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -1,7 +1,10 @@ name: Unit Tests - on: push: + branches: + - master + pull_request: + jobs: buildx: runs-on: ${{ matrix.os }} diff --git a/hack/update-gomock b/hack/update-gomock index 976c102fc7..912b86fb66 100755 --- a/hack/update-gomock +++ b/hack/update-gomock @@ -20,7 +20,9 @@ mockgen -package cloud -destination=./pkg/cloud/mock_ec2.go -source pkg/cloud/ec mockgen -package cloud -destination=./pkg/cloud/mock_cloud.go -source pkg/cloud/cloud_interface.go mockgen -package cloud -destination=./pkg/cloud/mock_metadata.go -source pkg/cloud/metadata_interface.go mockgen -package driver -destination=./pkg/driver/mock_mount.go -source pkg/driver/mount.go +mockgen -package mounter -destination=./pkg/mounter/mock_mount_windows.go -source pkg/mounter/safe_mounter_windows.go # Fixes "Mounter Type cannot implement 'Mounter' as it has a non-exported method and is defined in a different package" # See https://github.com/kubernetes/mount-utils/commit/a20fcfb15a701977d086330b47b7efad51eb608e for context. sed -i '/type MockMounter struct {/a \\tmount_utils.Interface' pkg/driver/mock_mount.go +sed -i '/type MockProxyMounter struct {/a \\tmount.Interface' pkg/mounter/mock_mount_windows.go diff --git a/pkg/mounter/mock_mount_windows.go b/pkg/mounter/mock_mount_windows.go index e3c5048dbe..d4821285c9 100644 --- a/pkg/mounter/mock_mount_windows.go +++ b/pkg/mounter/mock_mount_windows.go @@ -13,6 +13,7 @@ import ( // MockProxyMounter is a mock of ProxyMounter interface. type MockProxyMounter struct { + mount.Interface ctrl *gomock.Controller recorder *MockProxyMounterMockRecorder } @@ -153,6 +154,21 @@ func (mr *MockProxyMounterMockRecorder) IsLikelyNotMountPoint(file interface{}) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsLikelyNotMountPoint", reflect.TypeOf((*MockProxyMounter)(nil).IsLikelyNotMountPoint), file) } +// IsMountPoint mocks base method. +func (m *MockProxyMounter) IsMountPoint(file string) (bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "IsMountPoint", file) + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// IsMountPoint indicates an expected call of IsMountPoint. +func (mr *MockProxyMounterMockRecorder) IsMountPoint(file interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsMountPoint", reflect.TypeOf((*MockProxyMounter)(nil).IsMountPoint), file) +} + // IsMountPointMatch mocks base method. func (m *MockProxyMounter) IsMountPointMatch(mp mount.MountPoint, dir string) bool { m.ctrl.T.Helper() @@ -320,3 +336,17 @@ func (mr *MockProxyMounterMockRecorder) WriteVolumeCache(target interface{}) *go mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteVolumeCache", reflect.TypeOf((*MockProxyMounter)(nil).WriteVolumeCache), target) } + +// canSafelySkipMountPointCheck mocks base method. +func (m *MockProxyMounter) canSafelySkipMountPointCheck() bool { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "canSafelySkipMountPointCheck") + ret0, _ := ret[0].(bool) + return ret0 +} + +// canSafelySkipMountPointCheck indicates an expected call of canSafelySkipMountPointCheck. +func (mr *MockProxyMounterMockRecorder) canSafelySkipMountPointCheck() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "canSafelySkipMountPointCheck", reflect.TypeOf((*MockProxyMounter)(nil).canSafelySkipMountPointCheck)) +}