Skip to content

Commit

Permalink
Fix linting errors and add reference to newly created bug report cont…
Browse files Browse the repository at this point in the history
…ainers#24344.

Signed-off-by: Graceson Aufderheide <[email protected]>
  • Loading branch information
gaufde committed Oct 23, 2024
1 parent 2f80e21 commit 20fe8ac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/machine/e2e/config_init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (i *initMachine) buildCmd(m *machineTestBuilder) []string {
return
}

// The exception below is required for testing custom ignition files.
// FIXME:#24344 work-around for custom ignition removal
if strings.Contains(session.errorToString(), "failed to remove machines files: unable to find connection named") {
return
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/machine/e2e/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ var _ = Describe("podman machine init", func() {

configDir := filepath.Join(testDir, ".config", "containers", "podman", "machine", testProvider.VMType().String())

//test that all required machine files are created
// test that all required machine files are created
fileExtensions := []string{".lock", ".json", ".ign"}
for _, ext := range fileExtensions {
filename := filepath.Join(configDir, fmt.Sprintf("%s%s", name, ext))
Expand All @@ -259,7 +259,7 @@ var _ = Describe("podman machine init", func() {
Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("file %v does not exist", filename))
}

//enforce that the raw ignition is copied over verbatim
// enforce that the raw ignition is copied over verbatim
createdIgn := filepath.Join(configDir, fmt.Sprintf("%s%s", name, ".ign"))
contentWanted, err := os.ReadFile(tmpFile.Name())
Expect(err).ToNot(HaveOccurred())
Expand Down
1 change: 0 additions & 1 deletion pkg/machine/shim/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) error {
return err
}
} else {

err = ignBuilder.GenerateIgnitionConfig()
if err != nil {
return err
Expand Down

0 comments on commit 20fe8ac

Please sign in to comment.