diff --git a/builtin/provisioners/remote-exec/resource_provisioner_test.go b/builtin/provisioners/remote-exec/resource_provisioner_test.go index 47a723947..a10520fb8 100644 --- a/builtin/provisioners/remote-exec/resource_provisioner_test.go +++ b/builtin/provisioners/remote-exec/resource_provisioner_test.go @@ -41,6 +41,11 @@ func TestResourceProvider_Validate_bad(t *testing.T) { } } +var expectedScriptOut = `cd /tmp +wget http://foobar +exit 0 +` + func TestResourceProvider_generateScript(t *testing.T) { p := new(ResourceProvisioner) conf := testConfig(t, map[string]interface{}{ @@ -60,12 +65,6 @@ func TestResourceProvider_generateScript(t *testing.T) { } } -var expectedScriptOut = `#!/bin/sh -cd /tmp -wget http://foobar -exit 0 -` - func TestResourceProvider_CollectScripts_inline(t *testing.T) { p := new(ResourceProvisioner) conf := testConfig(t, map[string]interface{}{ @@ -91,8 +90,8 @@ func TestResourceProvider_CollectScripts_inline(t *testing.T) { t.Fatalf("err: %v", err) } - if string(out.Bytes()) != expectedScriptOut { - t.Fatalf("bad: %v", out.Bytes()) + if out.String() != expectedScriptOut { + t.Fatalf("bad: %v", out.String()) } } @@ -117,8 +116,8 @@ func TestResourceProvider_CollectScripts_script(t *testing.T) { t.Fatalf("err: %v", err) } - if string(out.Bytes()) != expectedScriptOut { - t.Fatalf("bad: %v", out.Bytes()) + if out.String() != expectedScriptOut { + t.Fatalf("bad: %v", out.String()) } } @@ -148,8 +147,8 @@ func TestResourceProvider_CollectScripts_scripts(t *testing.T) { t.Fatalf("err: %v", err) } - if string(out.Bytes()) != expectedScriptOut { - t.Fatalf("bad: %v", out.Bytes()) + if out.String() != expectedScriptOut { + t.Fatalf("bad: %v", out.String()) } } } diff --git a/builtin/provisioners/remote-exec/test-fixtures/script1.sh b/builtin/provisioners/remote-exec/test-fixtures/script1.sh index cd22f3e63..81b3d5af8 100755 --- a/builtin/provisioners/remote-exec/test-fixtures/script1.sh +++ b/builtin/provisioners/remote-exec/test-fixtures/script1.sh @@ -1,4 +1,3 @@ -#!/bin/sh cd /tmp wget http://foobar exit 0