iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated test to remove old DefaultTmpDir reference 

Fixed sudo logic
Fixed error message format issue for OSType check
This commit is contained in:
Dave Sanderson 2017-12-12 11:49:10 -07:00
parent 0efda50354
commit 630b7466d6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
provisioner/salt-masterless/provisioner.go
View File

@ -130,7 +130,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
var ok bool var ok bool
p.guestOSTypeConfig, ok = guestOSTypeConfigs[p.config.GuestOSType] p.guestOSTypeConfig, ok = guestOSTypeConfigs[p.config.GuestOSType]
if !ok { if !ok {
return fmt.Errorf("Invalid guest_os_type: \"$\"", p.config.GuestOSType) return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
} }
p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo) p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo)
@ -356,7 +356,7 @@ func (p *Provisioner) Cancel() {
// Prepends sudo to supplied command if config says to // Prepends sudo to supplied command if config says to
func (p *Provisioner) sudo(cmd string) string { func (p *Provisioner) sudo(cmd string) string {
if p.config.DisableSudo || p.config.GuestOSType != provisioner.WindowsOSType { if p.config.DisableSudo || (p.config.GuestOSType == provisioner.WindowsOSType) {
return cmd return cmd
} }

5
provisioner/salt-masterless/provisioner_test.go
View File

@ -1,11 +1,12 @@
package saltmasterless package saltmasterless
import ( import (
"github.com/hashicorp/packer/packer"
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "strings"
"testing" "testing"
"github.com/hashicorp/packer/packer"
) )
func testConfig() map[string]interface{} { func testConfig() map[string]interface{} {
@ -31,7 +32,7 @@ func TestProvisionerPrepare_Defaults(t *testing.T) {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
if p.config.TempConfigDir != DefaultTempConfigDir { if p.config.TempConfigDir != p.guestOSTypeConfig.tempDir {
t.Errorf("unexpected temp config dir: %s", p.config.TempConfigDir) t.Errorf("unexpected temp config dir: %s", p.config.TempConfigDir)
} }
} }