From ad6fe128d62136057de4e2c6d481406e0eb90d09 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Thu, 22 Feb 2024 12:31:39 +0100 Subject: [PATCH] Stop referring to mocks package as v2mock in favor of simply 'mocks' Signed-off-by: David Cassany --- cmd/config/config_test.go | 58 +++++++++++++++--------------- pkg/action/build_test.go | 38 ++++++++++---------- pkg/action/init_test.go | 6 ++-- pkg/action/install_test.go | 34 +++++++++--------- pkg/action/mount_test.go | 10 +++--- pkg/action/reset_test.go | 34 +++++++++--------- pkg/action/upgrade_test.go | 42 +++++++++++----------- pkg/bootloader/grub_test.go | 6 ++-- pkg/cloudinit/cloudinit_test.go | 10 +++--- pkg/config/config_test.go | 40 ++++++++++----------- pkg/elemental/elemental_test.go | 26 +++++++------- pkg/snapshotter/btrfs_test.go | 14 ++++---- pkg/snapshotter/loopdevice_test.go | 16 ++++----- pkg/types/runner_test.go | 6 ++-- pkg/types/syscall_test.go | 6 ++-- pkg/utils/runstage_test.go | 14 ++++---- pkg/utils/utils_test.go | 34 +++++++++--------- 17 files changed, 197 insertions(+), 197 deletions(-) diff --git a/cmd/config/config_test.go b/cmd/config/config_test.go index fc31164267d..fbcad513e09 100644 --- 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 index e83261d475e..98b17c26279 100644 --- 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 index 53e026462bf..ab00377af2a 100644 --- a/pkg/action/init_test.go +++ b/pkg/action/init_test.go @@ -30,14 +30,14 @@ 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() @@ -45,7 +45,7 @@ var _ = Describe("Init Action", func() { 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 index 618465e97b6..81c45330daa 100644 --- 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 index fdd4d1b3fd1..691ea19ebff 100644 --- a/pkg/action/mount_test.go +++ b/pkg/action/mount_test.go @@ -30,15 +30,15 @@ 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() @@ -46,10 +46,10 @@ var _ = Describe("Mount Action", func() { 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( diff --git a/pkg/action/reset_test.go b/pkg/action/reset_test.go index 0b6e22ade24..92da442318d 100644 --- a/pkg/action/reset_test.go +++ b/pkg/action/reset_test.go @@ -30,39 +30,39 @@ 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" ) var _ = Describe("Reset 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) - 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), @@ -90,7 +90,7 @@ var _ = Describe("Reset action tests", func() { _, err = fs.Create(recoveryImg) Expect(err).To(BeNil()) - bootloader = &v2mock.FakeBootloader{} + bootloader = &mocks.FakeBootloader{} mainDisk := block.Disk{ Name: "device", @@ -122,7 +122,7 @@ var _ = Describe("Reset action tests", func() { }, }, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index f4c5079eceb..484436b6eaf 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -31,40 +31,40 @@ 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" ) var _ = Describe("Runtime Actions", 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) - bootloader = &v2mock.FakeBootloader{} - extractor = v2mock.NewFakeImageExtractor(logger) + bootloader = &mocks.FakeBootloader{} + 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), @@ -124,7 +124,7 @@ var _ = Describe("Runtime Actions", func() { }, }, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() }) @@ -184,7 +184,7 @@ var _ = Describe("Runtime Actions", func() { Expect(err.Error()).To(ContainSubstring("setting default entry")) }) It("Successfully upgrades from docker image", func() { - Expect(v2mock.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 2)).To(Succeed()) + Expect(mocks.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 2)).To(Succeed()) // Create installState with previous install state statePath := filepath.Join(constants.RunningStateDir, constants.InstallStateFile) installState := &types.InstallState{ @@ -245,7 +245,7 @@ var _ = Describe("Runtime Actions", func() { Expect(state.Partitions[constants.StatePartName].Snapshots[2].Active). To(BeFalse()) Expect(state.Partitions[constants.StatePartName].Snapshots[3].Digest). - To(Equal(v2mock.FakeDigest)) + To(Equal(mocks.FakeDigest)) Expect(state.Partitions[constants.StatePartName].Snapshots[3].Source.String()). To(Equal("oci://alpine:latest")) Expect(state.Partitions[constants.StatePartName].Snapshots[2].Source.String()). @@ -255,7 +255,7 @@ var _ = Describe("Runtime Actions", func() { To(BeNil()) }) It("Successfully reboots after upgrade from docker image", func() { - Expect(v2mock.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 1)).To(Succeed()) + Expect(mocks.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 1)).To(Succeed()) spec.System = types.NewDockerSrc("alpine") config.Reboot = true upgrade, err = action.NewUpgradeAction(config, spec) @@ -274,7 +274,7 @@ var _ = Describe("Runtime Actions", func() { Expect(runner.IncludesCmds([][]string{{"reboot", "-f"}})).To(BeNil()) }) It("Successfully powers off after upgrade from docker image", func() { - Expect(v2mock.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 1)).To(Succeed()) + Expect(mocks.FakeLoopDeviceSnapshotsStatus(fs, constants.RunningStateDir, 1)).To(Succeed()) spec.System = types.NewDockerSrc("alpine") config.PowerOff = true upgrade, err = action.NewUpgradeAction(config, spec) diff --git a/pkg/bootloader/grub_test.go b/pkg/bootloader/grub_test.go index 31ccc5e2f64..fe2ff6954dc 100644 --- a/pkg/bootloader/grub_test.go +++ b/pkg/bootloader/grub_test.go @@ -30,7 +30,7 @@ import ( "github.com/rancher/elemental-toolkit/v2/pkg/config" "github.com/rancher/elemental-toolkit/v2/pkg/constants" eleefi "github.com/rancher/elemental-toolkit/v2/pkg/efi" - 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" "github.com/twpayne/go-vfs/v4" @@ -40,7 +40,7 @@ import ( var _ = Describe("Booloader", Label("bootloader", "grub"), func() { var logger types.Logger var fs vfs.FS - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var cleanup func() var err error var grub *bootloader.Grub @@ -54,7 +54,7 @@ var _ = Describe("Booloader", Label("bootloader", "grub"), func() { logger = types.NewNullLogger() fs, cleanup, err = vfst.NewTestFS(map[string]interface{}{}) Expect(err).Should(BeNil()) - runner = v2mock.NewFakeRunner() + runner = mocks.NewFakeRunner() grubCfg = []byte("grub configuration") osRelease = []byte("GRUB_ENTRY_NAME=some-name") diff --git a/pkg/cloudinit/cloudinit_test.go b/pkg/cloudinit/cloudinit_test.go index 737bcc52d28..d5391ad6690 100644 --- a/pkg/cloudinit/cloudinit_test.go +++ b/pkg/cloudinit/cloudinit_test.go @@ -32,7 +32,7 @@ import ( . "github.com/rancher/elemental-toolkit/v2/pkg/cloudinit" "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" @@ -168,7 +168,7 @@ stages: }) }) Describe("layout plugin execution", func() { - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var afs *vfst.TestFS var device, cmdFail string var partNum int @@ -183,7 +183,7 @@ stages: _, err = afs.Create(device) Expect(err).To(BeNil()) - runner = v2mock.NewFakeRunner() + runner = mocks.NewFakeRunner() runner.SideEffect = func(cmd string, args ...string) ([]byte, error) { if cmd == cmdFail { @@ -224,7 +224,7 @@ stages: pLabel: partLabel `, device)), constants.FilePerm) Expect(err).To(BeNil()) - ghwTest := v2mock.GhwMock{} + ghwTest := mocks.GhwMock{} disk := block.Disk{Name: "device", Partitions: []*block.Partition{ { Name: "device1", @@ -252,7 +252,7 @@ stages: size: 0 `, device)), constants.FilePerm) Expect(err).To(BeNil()) - ghwTest := v2mock.GhwMock{} + ghwTest := mocks.GhwMock{} disk := block.Disk{Name: "device", Partitions: []*block.Partition{ { Name: fmt.Sprintf("device%d", partNum), diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 098fd3e38b3..0bde99172c9 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -26,7 +26,7 @@ import ( "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" ) @@ -36,22 +36,22 @@ var _ = Describe("Types", Label("types", "config"), func() { var err error var cleanup func() var fs *vfst.TestFS - var mounter *v2mock.FakeMounter - var runner *v2mock.FakeRunner - var client *v2mock.FakeHTTPClient - var sysc *v2mock.FakeSyscall + var mounter *mocks.FakeMounter + var runner *mocks.FakeRunner + var client *mocks.FakeHTTPClient + var sysc *mocks.FakeSyscall var logger types.Logger - var ci *v2mock.FakeCloudInitRunner + var ci *mocks.FakeCloudInitRunner var c *types.Config BeforeEach(func() { fs, cleanup, err = vfst.NewTestFS(nil) Expect(err).ToNot(HaveOccurred()) - mounter = v2mock.NewFakeMounter() - runner = v2mock.NewFakeRunner() - client = &v2mock.FakeHTTPClient{} - sysc = &v2mock.FakeSyscall{} + mounter = mocks.NewFakeMounter() + runner = mocks.NewFakeRunner() + client = &mocks.FakeHTTPClient{} + sysc = &mocks.FakeSyscall{} logger = types.NewNullLogger() - ci = &v2mock.FakeCloudInitRunner{} + ci = &mocks.FakeCloudInitRunner{} c = config.NewConfig( config.WithFs(fs), config.WithMounter(mounter), @@ -90,8 +90,8 @@ var _ = Describe("Types", Label("types", "config"), func() { }) Describe("ConfigOptions no mounter specified", Label("mount", "mounter"), func() { It("should use the default mounter", Label("systemctl"), func() { - runner := v2mock.NewFakeRunner() - sysc := &v2mock.FakeSyscall{} + runner := mocks.NewFakeRunner() + sysc := &mocks.FakeSyscall{} logger := types.NewNullLogger() c := config.NewConfig( config.WithRunner(runner), @@ -146,7 +146,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }) Describe("ResetSpec", Label("reset"), func() { Describe("Successful executions", func() { - var ghwTest v2mock.GhwMock + var ghwTest mocks.GhwMock BeforeEach(func() { mainDisk := block.Disk{ Name: "device", @@ -178,7 +178,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }, }, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() @@ -231,7 +231,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }) Describe("Failures", func() { var bootedFrom string - var ghwTest v2mock.GhwMock + var ghwTest mocks.GhwMock BeforeEach(func() { bootedFrom = "" runner.SideEffect = func(cmd string, args ...string) ([]byte, error) { @@ -254,7 +254,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }, }, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() }) @@ -277,7 +277,7 @@ var _ = Describe("Types", Label("types", "config"), func() { Name: "device", Partitions: []*block.Partition{}, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() defer ghwTest.Clean() @@ -303,7 +303,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }) Describe("UpgradeSpec", Label("upgrade"), func() { Describe("Successful executions", func() { - var ghwTest v2mock.GhwMock + var ghwTest mocks.GhwMock BeforeEach(func() { mainDisk := block.Disk{ Name: "device", @@ -336,7 +336,7 @@ var _ = Describe("Types", Label("types", "config"), func() { }, }, } - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} ghwTest.AddDisk(mainDisk) ghwTest.CreateDevices() }) diff --git a/pkg/elemental/elemental_test.go b/pkg/elemental/elemental_test.go index dff0eb855e1..d43ab0ecc56 100644 --- a/pkg/elemental/elemental_test.go +++ b/pkg/elemental/elemental_test.go @@ -31,7 +31,7 @@ import ( conf "github.com/rancher/elemental-toolkit/v2/pkg/config" "github.com/rancher/elemental-toolkit/v2/pkg/constants" "github.com/rancher/elemental-toolkit/v2/pkg/elemental" - 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" ) @@ -48,21 +48,21 @@ func TestElementalSuite(t *testing.T) { var _ = Describe("Elemental", Label("elemental"), func() { var config *types.Config - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var logger types.Logger var syscall types.SyscallInterface - var client *v2mock.FakeHTTPClient - var mounter *v2mock.FakeMounter - var extractor *v2mock.FakeImageExtractor + var client *mocks.FakeHTTPClient + var mounter *mocks.FakeMounter + var extractor *mocks.FakeImageExtractor var fs *vfst.TestFS var cleanup func() 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{} logger = types.NewNullLogger() - extractor = v2mock.NewFakeImageExtractor(logger) + extractor = mocks.NewFakeImageExtractor(logger) fs, cleanup, _ = vfst.NewTestFS(nil) config = conf.NewConfig( conf.WithFs(fs), @@ -387,14 +387,14 @@ var _ = Describe("Elemental", Label("elemental"), func() { }) Describe("PartitionAndFormatDevice", Label("PartitionAndFormatDevice", "partition", "format"), func() { - var cInit *v2mock.FakeCloudInitRunner + var cInit *mocks.FakeCloudInitRunner var partNum int var printOut string var failPart bool var install *types.InstallSpec BeforeEach(func() { - cInit = &v2mock.FakeCloudInitRunner{ExecStages: []string{}, Error: false} + cInit = &mocks.FakeCloudInitRunner{ExecStages: []string{}, Error: false} config.CloudInitRunner = cInit install = conf.NewInstallSpec(*config) install.Target = "/some/device" @@ -1030,7 +1030,7 @@ var _ = Describe("Elemental", Label("elemental"), func() { }) // PathInMountPoints will check if the given path is in the mountPoints list -func pathInMountPoints(mounter *v2mock.FakeMounter, path string) bool { +func pathInMountPoints(mounter *mocks.FakeMounter, path string) bool { mountPoints, _ := mounter.List() for _, m := range mountPoints { if path == m.Path { diff --git a/pkg/snapshotter/btrfs_test.go b/pkg/snapshotter/btrfs_test.go index ad556a8439d..db9f6fa0418 100644 --- a/pkg/snapshotter/btrfs_test.go +++ b/pkg/snapshotter/btrfs_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/gomega" 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/snapshotter" "github.com/rancher/elemental-toolkit/v2/pkg/types" "github.com/rancher/elemental-toolkit/v2/pkg/utils" @@ -36,21 +36,21 @@ import ( var _ = Describe("Btrfs", Label("snapshotter", " btrfs"), func() { var cfg types.Config - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var fs vfs.FS var logger types.Logger - var mounter *v2mock.FakeMounter + var mounter *mocks.FakeMounter var cleanup func() - var bootloader *v2mock.FakeBootloader + var bootloader *mocks.FakeBootloader var memLog *bytes.Buffer var snapCfg types.SnapshotterConfig var rootDir string BeforeEach(func() { rootDir = "/some/root" - runner = v2mock.NewFakeRunner() - mounter = v2mock.NewFakeMounter() - bootloader = &v2mock.FakeBootloader{} + runner = mocks.NewFakeRunner() + mounter = mocks.NewFakeMounter() + bootloader = &mocks.FakeBootloader{} memLog = bytes.NewBuffer(nil) logger = types.NewBufferLogger(memLog) logger.SetLevel(types.DebugLevel()) diff --git a/pkg/snapshotter/loopdevice_test.go b/pkg/snapshotter/loopdevice_test.go index 7bebacb884d..236ca57f2ad 100644 --- a/pkg/snapshotter/loopdevice_test.go +++ b/pkg/snapshotter/loopdevice_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/gomega" 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/snapshotter" "github.com/rancher/elemental-toolkit/v2/pkg/types" "github.com/rancher/elemental-toolkit/v2/pkg/utils" @@ -34,21 +34,21 @@ import ( var _ = Describe("LoopDevice", Label("snapshotter", "loopdevice"), func() { var cfg types.Config - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var fs vfs.FS var logger types.Logger - var mounter *v2mock.FakeMounter + var mounter *mocks.FakeMounter var cleanup func() - var bootloader *v2mock.FakeBootloader + var bootloader *mocks.FakeBootloader var memLog *bytes.Buffer var snapCfg types.SnapshotterConfig var rootDir string BeforeEach(func() { rootDir = "/some/root" - runner = v2mock.NewFakeRunner() - mounter = v2mock.NewFakeMounter() - bootloader = &v2mock.FakeBootloader{} + runner = mocks.NewFakeRunner() + mounter = mocks.NewFakeMounter() + bootloader = &mocks.FakeBootloader{} memLog = bytes.NewBuffer(nil) logger = types.NewBufferLogger(memLog) logger.SetLevel(types.DebugLevel()) @@ -192,7 +192,7 @@ var _ = Describe("LoopDevice", Label("snapshotter", "loopdevice"), func() { BeforeEach(func() { - v2mock.FakeLoopDeviceSnapshotsStatus(fs, rootDir, 5) + mocks.FakeLoopDeviceSnapshotsStatus(fs, rootDir, 5) runner.SideEffect = func(cmd string, args ...string) ([]byte, error) { if cmd == "losetup" { diff --git a/pkg/types/runner_test.go b/pkg/types/runner_test.go index b891100abd5..e86ec16c8c7 100644 --- a/pkg/types/runner_test.go +++ b/pkg/types/runner_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - 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" ) @@ -33,12 +33,12 @@ var _ = Describe("Runner", Label("types", "runner"), func() { Expect(err).To(BeNil()) }) It("Runs commands on the fake runner", func() { - r := v2mock.NewFakeRunner() + r := mocks.NewFakeRunner() _, err := r.Run("pwd") Expect(err).To(BeNil()) }) It("Sets and gets the logger on the fake runner", func() { - r := v2mock.NewFakeRunner() + r := mocks.NewFakeRunner() Expect(r.GetLogger()).To(BeNil()) logger := types.NewNullLogger() r.SetLogger(logger) diff --git a/pkg/types/syscall_test.go b/pkg/types/syscall_test.go index 454823c0dcb..0b957253157 100644 --- a/pkg/types/syscall_test.go +++ b/pkg/types/syscall_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - 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" ) @@ -34,7 +34,7 @@ var _ = Describe("Syscall", Label("types", "syscall"), func() { }) It("Calling chroot on the fake syscall should not fail", func() { - r := v2mock.FakeSyscall{} + r := mocks.FakeSyscall{} err := r.Chroot("/tmp/") // We need elevated privs to chroot so this should fail Expect(err).To(BeNil()) @@ -47,7 +47,7 @@ var _ = Describe("Syscall", Label("types", "syscall"), func() { }) It("Calling chroot on the fake syscall should not fail", func() { - r := v2mock.FakeSyscall{} + r := mocks.FakeSyscall{} err := r.Chdir("/tmp/") // We need elevated privs to chroot so this should fail Expect(err).To(BeNil()) diff --git a/pkg/utils/runstage_test.go b/pkg/utils/runstage_test.go index 60203acbfe1..edf3648bfd0 100644 --- a/pkg/utils/runstage_test.go +++ b/pkg/utils/runstage_test.go @@ -30,7 +30,7 @@ import ( "github.com/rancher/elemental-toolkit/v2/pkg/cloudinit" 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" ) @@ -51,11 +51,11 @@ func writeCmdline(s string, fs types.FS) error { var _ = Describe("run stage", Label("RunStage"), func() { var config *types.Config - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var logger types.Logger - var syscall *v2mock.FakeSyscall - var client *v2mock.FakeHTTPClient - var mounter *v2mock.FakeMounter + var syscall *mocks.FakeSyscall + var client *mocks.FakeHTTPClient + var mounter *mocks.FakeMounter var fs vfs.FS var memLog *bytes.Buffer @@ -64,7 +64,7 @@ var _ = Describe("run stage", Label("RunStage"), func() { BeforeEach(func() { strict = false - runner = v2mock.NewFakeRunner() + runner = mocks.NewFakeRunner() // Use a different config with a buffer for logger, so we can check the output // We also use the real fs memLog = &bytes.Buffer{} @@ -152,7 +152,7 @@ var _ = Describe("run stage", Label("RunStage"), func() { }) It("ignores non existing cloud-init paths", func() { - ci := &v2mock.FakeCloudInitRunner{} + ci := &mocks.FakeCloudInitRunner{} config.CloudInitRunner = ci Expect(utils.MkdirAll(fs, "/existing", constants.DirPerm)).To(Succeed()) // Symlinks to existing directoryes are also valid diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 84e25ef0b6b..e83baf32251 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -36,7 +36,7 @@ import ( 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" ) @@ -51,24 +51,24 @@ func getNamesFromListFiles(list []fs.DirEntry) []string { var _ = Describe("Utils", Label("utils"), func() { var config *types.Config - var runner *v2mock.FakeRunner + var runner *mocks.FakeRunner var realRunner *types.RealRunner var logger types.Logger - var syscall *v2mock.FakeSyscall - var client *v2mock.FakeHTTPClient - var mounter *v2mock.FakeMounter - var extractor *v2mock.FakeImageExtractor + var syscall *mocks.FakeSyscall + var client *mocks.FakeHTTPClient + var mounter *mocks.FakeMounter + var extractor *mocks.FakeImageExtractor var fs vfs.FS var cleanup func() 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{} logger = types.NewNullLogger() realRunner = &types.RealRunner{Logger: logger} - extractor = v2mock.NewFakeImageExtractor(logger) + extractor = mocks.NewFakeImageExtractor(logger) // Ensure /tmp exists in the VFS fs, cleanup, _ = vfst.NewTestFS(nil) fs.Mkdir("/tmp", constants.DirPerm) @@ -200,7 +200,7 @@ var _ = Describe("Utils", Label("utils"), func() { } }) It("returns found device", func() { - ghwTest := v2mock.GhwMock{} + ghwTest := mocks.GhwMock{} disk := block.Disk{Name: "device", Partitions: []*block.Partition{ { Name: "device1", @@ -222,9 +222,9 @@ var _ = Describe("Utils", Label("utils"), func() { }) }) Describe("GetAllPartitions", Label("lsblk", "partitions"), func() { - var ghwTest v2mock.GhwMock + var ghwTest mocks.GhwMock BeforeEach(func() { - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} disk1 := block.Disk{ Name: "sda", Partitions: []*block.Partition{ @@ -264,9 +264,9 @@ var _ = Describe("Utils", Label("utils"), func() { }) }) Describe("GetPartitionFS", Label("lsblk", "partitions"), func() { - var ghwTest v2mock.GhwMock + var ghwTest mocks.GhwMock BeforeEach(func() { - ghwTest = v2mock.GhwMock{} + ghwTest = mocks.GhwMock{} disk := block.Disk{Name: "device", Partitions: []*block.Partition{ { Name: "device1", @@ -340,7 +340,7 @@ var _ = Describe("Utils", Label("utils"), func() { }) It("returns found types.Partition", func() { var flags []string - ghwTest := v2mock.GhwMock{} + ghwTest := mocks.GhwMock{} disk := block.Disk{Name: "device", Partitions: []*block.Partition{ { Name: "device1",