Stop referring to mocks package as v2mock in favor of simply 'mocks'

Signed-off-by: David Cassany <dcassany@suse.com>
rancher · Feb 22, 2024 · ad6fe12 · ad6fe12
1 parent f5515ea
commit ad6fe12
Show file tree

Hide file tree

Showing 17 changed files with 197 additions and 197 deletions.
diff --git a/cmd/config/config_test.go b/cmd/config/config_test.go
@@ -37,15 +37,15 @@ import (
 	"github.com/twpayne/go-vfs/v4/vfst"
 
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
-	v2mock "github.com/rancher/elemental-toolkit/v2/pkg/mocks"
+	"github.com/rancher/elemental-toolkit/v2/pkg/mocks"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 )
 
 var _ = Describe("Config", Label("config"), func() {
-	var mounter *v2mock.FakeMounter
+	var mounter *mocks.FakeMounter
 
 	BeforeEach(func() {
-		mounter = v2mock.NewFakeMounter()
+		mounter = mocks.NewFakeMounter()
 	})
 	AfterEach(func() {
 		viper.Reset()
@@ -133,25 +133,25 @@ var _ = Describe("Config", Label("config"), func() {
 
 	Describe("Read build specs", Label("build"), func() {
 		var cfg *types.BuildConfig
-		var runner *v2mock.FakeRunner
+		var runner *mocks.FakeRunner
 		var fs vfs.FS
 		var logger types.Logger
-		var mounter *v2mock.FakeMounter
-		var syscall *v2mock.FakeSyscall
-		var client *v2mock.FakeHTTPClient
-		var cloudInit *v2mock.FakeCloudInitRunner
+		var mounter *mocks.FakeMounter
+		var syscall *mocks.FakeSyscall
+		var client *mocks.FakeHTTPClient
+		var cloudInit *mocks.FakeCloudInitRunner
 		var cleanup func()
 		var memLog *bytes.Buffer
 		var err error
 
 		BeforeEach(func() {
-			runner = v2mock.NewFakeRunner()
-			syscall = &v2mock.FakeSyscall{}
-			mounter = v2mock.NewFakeMounter()
-			client = &v2mock.FakeHTTPClient{}
+			runner = mocks.NewFakeRunner()
+			syscall = &mocks.FakeSyscall{}
+			mounter = mocks.NewFakeMounter()
+			client = &mocks.FakeHTTPClient{}
 			memLog = &bytes.Buffer{}
 			logger = types.NewBufferLogger(memLog)
-			cloudInit = &v2mock.FakeCloudInitRunner{}
+			cloudInit = &mocks.FakeCloudInitRunner{}
 
 			fs, cleanup, err = vfst.NewTestFS(map[string]interface{}{})
 			Expect(err).Should(BeNil())
@@ -263,25 +263,25 @@ var _ = Describe("Config", Label("config"), func() {
 	})
 	Describe("Read runtime specs", Label("spec"), func() {
 		var cfg *types.RunConfig
-		var runner *v2mock.FakeRunner
+		var runner *mocks.FakeRunner
 		var fs vfs.FS
 		var logger types.Logger
-		var mounter *v2mock.FakeMounter
-		var syscall *v2mock.FakeSyscall
-		var client *v2mock.FakeHTTPClient
-		var cloudInit *v2mock.FakeCloudInitRunner
+		var mounter *mocks.FakeMounter
+		var syscall *mocks.FakeSyscall
+		var client *mocks.FakeHTTPClient
+		var cloudInit *mocks.FakeCloudInitRunner
 		var cleanup func()
 		var memLog *bytes.Buffer
 		var err error
 
 		BeforeEach(func() {
-			runner = v2mock.NewFakeRunner()
-			syscall = &v2mock.FakeSyscall{}
-			mounter = v2mock.NewFakeMounter()
-			client = &v2mock.FakeHTTPClient{}
+			runner = mocks.NewFakeRunner()
+			syscall = &mocks.FakeSyscall{}
+			mounter = mocks.NewFakeMounter()
+			client = &mocks.FakeHTTPClient{}
 			memLog = &bytes.Buffer{}
 			logger = types.NewBufferLogger(memLog)
-			cloudInit = &v2mock.FakeCloudInitRunner{}
+			cloudInit = &mocks.FakeCloudInitRunner{}
 
 			fs, cleanup, err = vfst.NewTestFS(map[string]interface{}{})
 			Expect(err).Should(BeNil())
@@ -351,7 +351,7 @@ var _ = Describe("Config", Label("config"), func() {
 		Describe("Read ResetSpec", Label("install"), func() {
 			var flags *pflag.FlagSet
 			var bootedFrom string
-			var ghwTest v2mock.GhwMock
+			var ghwTest mocks.GhwMock
 
 			BeforeEach(func() {
 				bootedFrom = constants.RecoveryImgFile
@@ -384,7 +384,7 @@ var _ = Describe("Config", Label("config"), func() {
 						},
 					},
 				}
-				ghwTest = v2mock.GhwMock{}
+				ghwTest = mocks.GhwMock{}
 				ghwTest.AddDisk(mainDisk)
 				ghwTest.CreateDevices()
 			})
@@ -423,7 +423,7 @@ var _ = Describe("Config", Label("config"), func() {
 		})
 		Describe("Read UpgradeSpec", Label("install"), func() {
 			var flags *pflag.FlagSet
-			var ghwTest v2mock.GhwMock
+			var ghwTest mocks.GhwMock
 
 			BeforeEach(func() {
 				flags = pflag.NewFlagSet("testflags", 1)
@@ -453,7 +453,7 @@ var _ = Describe("Config", Label("config"), func() {
 						},
 					},
 				}
-				ghwTest = v2mock.GhwMock{}
+				ghwTest = mocks.GhwMock{}
 				ghwTest.AddDisk(mainDisk)
 				ghwTest.CreateDevices()
 				defer ghwTest.Clean()
@@ -470,7 +470,7 @@ var _ = Describe("Config", Label("config"), func() {
 			})
 		})
 		Describe("Read MountSpec", Label("mount"), func() {
-			var ghwTest v2mock.GhwMock
+			var ghwTest mocks.GhwMock
 			BeforeEach(func() {
 				mainDisk := block.Disk{
 					Name: "device",
@@ -489,7 +489,7 @@ var _ = Describe("Config", Label("config"), func() {
 						},
 					},
 				}
-				ghwTest = v2mock.GhwMock{}
+				ghwTest = mocks.GhwMock{}
 				ghwTest.AddDisk(mainDisk)
 				ghwTest.CreateDevices()
 			})

diff --git a/pkg/action/build_test.go b/pkg/action/build_test.go
@@ -34,36 +34,36 @@ import (
 	"github.com/rancher/elemental-toolkit/v2/pkg/action"
 	"github.com/rancher/elemental-toolkit/v2/pkg/config"
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
-	v2mock "github.com/rancher/elemental-toolkit/v2/pkg/mocks"
+	"github.com/rancher/elemental-toolkit/v2/pkg/mocks"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 	"github.com/rancher/elemental-toolkit/v2/pkg/utils"
 )
 
 var _ = Describe("Build Actions", func() {
 	var cfg *types.BuildConfig
-	var runner *v2mock.FakeRunner
+	var runner *mocks.FakeRunner
 	var fs vfs.FS
 	var logger types.Logger
-	var mounter *v2mock.FakeMounter
-	var syscall *v2mock.FakeSyscall
-	var client *v2mock.FakeHTTPClient
-	var cloudInit *v2mock.FakeCloudInitRunner
-	var extractor *v2mock.FakeImageExtractor
+	var mounter *mocks.FakeMounter
+	var syscall *mocks.FakeSyscall
+	var client *mocks.FakeHTTPClient
+	var cloudInit *mocks.FakeCloudInitRunner
+	var extractor *mocks.FakeImageExtractor
 	var cleanup func()
 	var memLog *bytes.Buffer
-	var bootloader *v2mock.FakeBootloader
+	var bootloader *mocks.FakeBootloader
 
 	BeforeEach(func() {
-		runner = v2mock.NewFakeRunner()
-		syscall = &v2mock.FakeSyscall{}
-		mounter = v2mock.NewFakeMounter()
-		client = &v2mock.FakeHTTPClient{}
+		runner = mocks.NewFakeRunner()
+		syscall = &mocks.FakeSyscall{}
+		mounter = mocks.NewFakeMounter()
+		client = &mocks.FakeHTTPClient{}
 		memLog = &bytes.Buffer{}
-		bootloader = &v2mock.FakeBootloader{}
+		bootloader = &mocks.FakeBootloader{}
 		logger = types.NewBufferLogger(memLog)
 		logger.SetLevel(logrus.DebugLevel)
-		extractor = v2mock.NewFakeImageExtractor(logger)
-		cloudInit = &v2mock.FakeCloudInitRunner{}
+		extractor = mocks.NewFakeImageExtractor(logger)
+		cloudInit = &mocks.FakeCloudInitRunner{}
 		fs, cleanup, _ = vfst.NewTestFS(map[string]interface{}{})
 		cfg = config.NewBuildConfig(
 			config.WithFs(fs),
@@ -111,19 +111,19 @@ var _ = Describe("Build Actions", func() {
 				logger.Debugf("Creating %s", bootDir)
 				err := utils.MkdirAll(fs, bootDir, constants.DirPerm)
 				if err != nil {
-					return v2mock.FakeDigest, err
+					return mocks.FakeDigest, err
 				}
 				err = utils.MkdirAll(fs, filepath.Join(destination, "lib/modules/6.4"), constants.DirPerm)
 				if err != nil {
-					return v2mock.FakeDigest, err
+					return mocks.FakeDigest, err
 				}
 				_, err = fs.Create(filepath.Join(bootDir, "vmlinuz-6.4"))
 				if err != nil {
-					return v2mock.FakeDigest, err
+					return mocks.FakeDigest, err
 				}
 
 				_, err = fs.Create(filepath.Join(bootDir, "initrd"))
-				return v2mock.FakeDigest, err
+				return mocks.FakeDigest, err
 			}
 
 			buildISO := action.NewBuildISOAction(cfg, iso, action.WithLiveBootloader(bootloader))

diff --git a/pkg/action/init_test.go b/pkg/action/init_test.go
@@ -30,22 +30,22 @@ import (
 	"github.com/rancher/elemental-toolkit/v2/pkg/config"
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
 	"github.com/rancher/elemental-toolkit/v2/pkg/features"
-	v2mock "github.com/rancher/elemental-toolkit/v2/pkg/mocks"
+	"github.com/rancher/elemental-toolkit/v2/pkg/mocks"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 	"github.com/rancher/elemental-toolkit/v2/pkg/utils"
 )
 
 var _ = Describe("Init Action", func() {
 	var cfg *types.RunConfig
-	var runner *v2mock.FakeRunner
+	var runner *mocks.FakeRunner
 	var fs vfs.FS
 	var logger types.Logger
 	var cleanup func()
 	var memLog *bytes.Buffer
 	var expectedNumUnits int
 
 	BeforeEach(func() {
-		runner = v2mock.NewFakeRunner()
+		runner = mocks.NewFakeRunner()
 		memLog = &bytes.Buffer{}
 		logger = types.NewBufferLogger(memLog)
 		logger.SetLevel(logrus.DebugLevel)

diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/rancher/elemental-toolkit/v2/pkg/action"
 	conf "github.com/rancher/elemental-toolkit/v2/pkg/config"
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
-	v2mock "github.com/rancher/elemental-toolkit/v2/pkg/mocks"
+	"github.com/rancher/elemental-toolkit/v2/pkg/mocks"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 	"github.com/rancher/elemental-toolkit/v2/pkg/utils"
 )
@@ -44,33 +44,33 @@ const partTmpl = `
 
 var _ = Describe("Install action tests", func() {
 	var config *types.RunConfig
-	var runner *v2mock.FakeRunner
+	var runner *mocks.FakeRunner
 	var fs vfs.FS
 	var logger types.Logger
-	var mounter *v2mock.FakeMounter
-	var syscall *v2mock.FakeSyscall
-	var client *v2mock.FakeHTTPClient
-	var cloudInit *v2mock.FakeCloudInitRunner
-	var extractor *v2mock.FakeImageExtractor
+	var mounter *mocks.FakeMounter
+	var syscall *mocks.FakeSyscall
+	var client *mocks.FakeHTTPClient
+	var cloudInit *mocks.FakeCloudInitRunner
+	var extractor *mocks.FakeImageExtractor
 	var cleanup func()
 	var memLog *bytes.Buffer
-	var ghwTest v2mock.GhwMock
-	var bootloader *v2mock.FakeBootloader
+	var ghwTest mocks.GhwMock
+	var bootloader *mocks.FakeBootloader
 
 	BeforeEach(func() {
-		runner = v2mock.NewFakeRunner()
-		syscall = &v2mock.FakeSyscall{}
-		mounter = v2mock.NewFakeMounter()
-		client = &v2mock.FakeHTTPClient{}
+		runner = mocks.NewFakeRunner()
+		syscall = &mocks.FakeSyscall{}
+		mounter = mocks.NewFakeMounter()
+		client = &mocks.FakeHTTPClient{}
 		memLog = &bytes.Buffer{}
 		logger = types.NewBufferLogger(memLog)
 		logger.SetLevel(types.DebugLevel())
-		extractor = v2mock.NewFakeImageExtractor(logger)
+		extractor = mocks.NewFakeImageExtractor(logger)
 		var err error
 		fs, cleanup, err = vfst.NewTestFS(map[string]interface{}{})
 		Expect(err).Should(BeNil())
 
-		cloudInit = &v2mock.FakeCloudInitRunner{}
+		cloudInit = &mocks.FakeCloudInitRunner{}
 		config = conf.NewRunConfig(
 			conf.WithFs(fs),
 			conf.WithRunner(runner),
@@ -102,7 +102,7 @@ var _ = Describe("Install action tests", func() {
 			_, err = fs.Create(device)
 			Expect(err).ShouldNot(HaveOccurred())
 
-			bootloader = &v2mock.FakeBootloader{}
+			bootloader = &mocks.FakeBootloader{}
 
 			partNum := 0
 			partedOut := printOutput
@@ -197,7 +197,7 @@ var _ = Describe("Install action tests", func() {
 					},
 				},
 			}
-			ghwTest = v2mock.GhwMock{}
+			ghwTest = mocks.GhwMock{}
 			ghwTest.AddDisk(mainDisk)
 			ghwTest.CreateDevices()
 

diff --git a/pkg/action/mount_test.go b/pkg/action/mount_test.go
@@ -30,26 +30,26 @@ import (
 	"github.com/rancher/elemental-toolkit/v2/pkg/action"
 	"github.com/rancher/elemental-toolkit/v2/pkg/config"
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
-	v2mock "github.com/rancher/elemental-toolkit/v2/pkg/mocks"
+	"github.com/rancher/elemental-toolkit/v2/pkg/mocks"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 	"github.com/rancher/elemental-toolkit/v2/pkg/utils"
 )
 
 var _ = Describe("Mount Action", func() {
 	var cfg *types.RunConfig
-	var mounter *v2mock.FakeMounter
-	var runner *v2mock.FakeRunner
+	var mounter *mocks.FakeMounter
+	var runner *mocks.FakeRunner
 	var fs vfs.FS
 	var logger types.Logger
 	var cleanup func()
 	var memLog *bytes.Buffer
 	var spec *types.MountSpec
 
 	BeforeEach(func() {
-		mounter = v2mock.NewFakeMounter()
+		mounter = mocks.NewFakeMounter()
 		memLog = &bytes.Buffer{}
 		logger = types.NewBufferLogger(memLog)
-		runner = v2mock.NewFakeRunner()
+		runner = mocks.NewFakeRunner()
 		logger.SetLevel(logrus.DebugLevel)
 		fs, cleanup, _ = vfst.NewTestFS(map[string]interface{}{})
 		cfg = config.NewRunConfig(