Skip to content

Commit 7508d93

Browse files
committed
improve testinfra arg string formatting
1 parent 37f4c6f commit 7508d93

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
- Validate minimum version of `pytest`.
44
- Add forced short summary configuration to `compact` parameter functionality.
55
- Improve Packer `SSHAgentAuth` check.
6+
- Improve Testinfra argument string formatting.
67

78
### 1.5.2
89
- Note in Packer logs when they originate from this plugin.

provisioner/command.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (provisioner *Provisioner) determineExecCmd(ui packer.Ui) (*exec.Cmd, *pack
171171
return nil, nil, err
172172
}
173173
if len(keyword) > 0 {
174-
args = append(args, "-k", fmt.Sprintf("\"%s\"", keyword))
174+
args = append(args, "-k", keyword)
175175
}
176176
// marker
177177
marker, err := interpolate.Render(provisioner.config.Marker, &provisioner.config.ctx)
@@ -180,7 +180,7 @@ func (provisioner *Provisioner) determineExecCmd(ui packer.Ui) (*exec.Cmd, *pack
180180
return nil, nil, err
181181
}
182182
if len(marker) > 0 {
183-
args = append(args, "-m", fmt.Sprintf("\"%s\"", marker))
183+
args = append(args, "-m", marker)
184184
}
185185
// parallel
186186
if provisioner.config.Parallel {
@@ -190,7 +190,7 @@ func (provisioner *Provisioner) determineExecCmd(ui packer.Ui) (*exec.Cmd, *pack
190190
if provisioner.config.Sudo {
191191
args = append(args, "--sudo")
192192
} else if len(provisioner.config.SudoUser) > 0 { // sudo_user
193-
args = append(args, fmt.Sprintf("\"--sudo-user=%s\"", provisioner.config.SudoUser))
193+
args = append(args, fmt.Sprintf("--sudo-user=%s", provisioner.config.SudoUser))
194194
}
195195

196196
// verbose

provisioner/command_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestProvisionerDetermineExecCmd(test *testing.T) {
5858
test.Error("determineExecCmd function failed to determine execution directory for basic config")
5959
test.Errorf("actual: %s, expected: %s", execCmd.Dir, basicConfig.Chdir)
6060
}
61-
if !slices.Equal(execCmd.Args, slices.Concat([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", provisioner.generatedData["User"], provisioner.generatedData["Host"], provisioner.generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", provisioner.generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "--no-header", "--no-summary", "--disable-warnings", "--force-short-summary", "-k", fmt.Sprintf("\"%s\"", provisioner.config.Keyword), "-m", fmt.Sprintf("\"%s\"", provisioner.config.Marker), "-n", "auto", "--sudo", "-vv"}, provisioner.config.TestFiles)) {
61+
if !slices.Equal(execCmd.Args, slices.Concat([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", provisioner.generatedData["User"], provisioner.generatedData["Host"], provisioner.generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", provisioner.generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "--no-header", "--no-summary", "--disable-warnings", "--force-short-summary", "-k", provisioner.config.Keyword, "-m", provisioner.config.Marker, "-n", "auto", "--sudo", "-vv"}, provisioner.config.TestFiles)) {
6262
test.Errorf("determineExecCmd function failed to properly determine remote execution command for basic config with SSH communicator: %s", execCmd.String())
6363
}
6464
if localCmd != nil {

0 commit comments

Comments
 (0)