diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 132dd9323..8633e32f7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -720,47 +720,47 @@ }, { "ImportPath": "github.com/hashicorp/hcl", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/ast", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/fmtcmd", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/parser", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/printer", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/scanner", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/strconv", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/hcl/token", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/json/parser", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/json/scanner", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hcl/json/token", - "Rev": "27a57f2605e04995c111273c263d51cee60d9bc4" + "Rev": "9a905a34e6280ce905da1a32344b25e81011197a" }, { "ImportPath": "github.com/hashicorp/hil", diff --git a/command/fmt_test.go b/command/fmt_test.go index b10880f92..191cd47ee 100644 --- a/command/fmt_test.go +++ b/command/fmt_test.go @@ -125,7 +125,6 @@ func TestFmt_directoryArg(t *testing.T) { } func TestFmt_stdinArg(t *testing.T) { - t.Skip("phinze is working on fixing this test") input := new(bytes.Buffer) input.Write(fmtFixture.input) @@ -150,7 +149,6 @@ func TestFmt_stdinArg(t *testing.T) { } func TestFmt_nonDefaultOptions(t *testing.T) { - t.Skip("phinze is working on fixing this test") tempDir, err := fmtFixtureWriteDir() if err != nil { t.Fatalf("err: %s", err) diff --git a/vendor/github.com/hashicorp/hcl/hcl/fmtcmd/fmtcmd.go b/vendor/github.com/hashicorp/hcl/hcl/fmtcmd/fmtcmd.go index afc1e4eb1..15a5f66d7 100644 --- a/vendor/github.com/hashicorp/hcl/hcl/fmtcmd/fmtcmd.go +++ b/vendor/github.com/hashicorp/hcl/hcl/fmtcmd/fmtcmd.go @@ -60,8 +60,6 @@ func processFile(filename string, in io.Reader, out io.Writer, stdin bool, opts if err != nil { return err } - // Files should end with newlines - res = append(res, []byte("\n")...) if !bytes.Equal(src, res) { // formatting has changed