Adapt unit tests

Signed-off-by: David Cassany <dcassany@suse.com>

cmd/config/config_test.go

@@ -288,7 +288,7 @@ var _ = Describe("Config", Label("config"), func() {
 
 			err = fs.Mkdir("/proc", constants.DirPerm)
 			Expect(err).Should(BeNil())
-			err = fs.WriteFile("/proc/cmdline", []byte("root=LABEL=COS_STATE elemental.image=active elemental.overlay=tmpfs:30%"), 0444)
+			err = fs.WriteFile("/proc/cmdline", []byte("root=LABEL=COS_STATE elemental.mode=active elemental.overlay=tmpfs:30%"), 0444)
 			Expect(err).Should(BeNil())
 
 			cfg, err = ReadConfigRun("fixtures/config/", nil, mounter)

pkg/action/build_test.go

@@ -251,7 +251,6 @@ var _ = Describe("Build Actions", func() {
 				{"mkfs.vfat", "-n", "COS_GRUB"},
 				{"mkfs.ext4", "-L", "COS_OEM"},
 				{"mkfs.ext4", "-L", "COS_RECOVERY"},
-				{"mkfs.ext4", "-L", "COS_STATE"},
 				{"sgdisk", "-p", "/tmp/test/elemental.raw"},
 				{"partx", "-u", "/tmp/test/elemental.raw"},
 			})).To(Succeed())

pkg/action/mount_test.go

@@ -105,7 +105,7 @@ var _ = Describe("Mount Action", func() {
 
 			fstab, err := cfg.Config.Fs.ReadFile(filepath.Join(spec.Sysroot, "/etc/fstab"))
 			Expect(err).To(BeNil())
-			expectedFstab := "/dev/loop0\t/\tauto\tro,relatime\t0\t0\n"
+			expectedFstab := "/dev/loop0\t/\text2\tro,relatime\t0\t0\n"
 			expectedFstab += "/dev/somedevice\t/run/elemental\tvfat\trw,defaults\t0\t0\n"
 			expectedFstab += "/dev/persistentdev\t/run/elemental/persistent\tauto\tdefaults\t0\t0\n"
 			expectedFstab += "/run/elemental/persistent/.state/some-path.bind\t/some/path\tnone\tdefaults,bind\t0\t0\n"
@@ -145,7 +145,7 @@ var _ = Describe("Mount Action", func() {
 
 			fstab, err := cfg.Config.Fs.ReadFile(filepath.Join(spec.Sysroot, "/etc/fstab"))
 			Expect(err).To(BeNil())
-			expectedFstab := "/dev/loop0\t/\tauto\tro,relatime\t0\t0\n"
+			expectedFstab := "/dev/loop0\t/\text2\tro,relatime\t0\t0\n"
 			expectedFstab += "/dev/somedevice\t/run/elemental/persistent/somedir\tvfat\trw,defaults\t0\t0\n"
 			expectedFstab += "/dev/persistentdev\t/run/elemental/persistent\tauto\tdefaults\t0\t0\n"
 			expectedFstab += "overlay\t/some/path\toverlay\t"

pkg/action/upgrade_test.go

@@ -226,7 +226,7 @@ var _ = Describe("Runtime Actions", func() {
 				// Writes filesystem labels to GRUB oem env file
 				grubOEMEnv := filepath.Join(spec.Partitions.EFI.MountPoint, constants.GrubOEMEnv)
 				Expect(runner.IncludesCmds(
-					[][]string{{"grub2-editenv", grubOEMEnv, "set", "passive_snaps=passive_2"}},
+					[][]string{{"grub2-editenv", grubOEMEnv, "set", "passive_snaps=2"}},
 				)).To(Succeed())
 
 				// Expect snapshot 2 and 3 to be there and 1 deleted