From 66a6b293234bcce8f083bb91a1cfce01d2dec9a2 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 16 Oct 2014 18:41:32 -0400 Subject: [PATCH 1/3] Fixed broken common test --- common_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common_test.go b/common_test.go index 5f13bb3..dc65f76 100644 --- a/common_test.go +++ b/common_test.go @@ -3,7 +3,7 @@ package jsh import "testing" func TestToJson(t *testing.T) { - fixture := JshOutput{[]string{}, []string{}} + fixture := JshFrame{[]string{}, []string{}} json := fixture.ToJson() expected := `{"StdOut":[],"StdErr":[]}` actual := *json @@ -11,7 +11,7 @@ func TestToJson(t *testing.T) { t.Errorf("Empty fixture did not match:\n%s != %s", expected, actual) } - fixture = JshOutput{[]string{"potato!"}, []string{}} + fixture = JshFrame{[]string{"potato!"}, []string{}} json = fixture.ToJson() expected = `{"StdOut":["potato!"],"StdErr":[]}` actual = *json From 743a0061c6b1f92875d0867c9507f8214bafe088 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 16 Oct 2014 18:42:11 -0400 Subject: [PATCH 2/3] Removed extraneous tests --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ca74f0..f8ad4c9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ GOBUILD=$(GOCMD) build GOCLEAN=$(GOCMD) clean GOINSTALL=$(GOCMD) install GOTEST=$(GOCMD) test -GODEP=$(GOTEST) -i +GODEP=$(GOTEST) GOFMT=gofmt -w GOCOVER=$(GOCMD) tool cover COVER_DIR=cover From a8f648dcb153a8c8831980088e060105a5507154 Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Thu, 16 Oct 2014 18:43:30 -0400 Subject: [PATCH 3/3] Fixed broken filesystem tests --- filesystem_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesystem_test.go b/filesystem_test.go index dfa7ecb..60f5093 100644 --- a/filesystem_test.go +++ b/filesystem_test.go @@ -20,7 +20,7 @@ func TestNewFilesystem(t *testing.T) { if err != nil { t.Errorf("Passing 5 strings should not raise an error") } - expected := Filesystem{"1", "2", "3", "4", "5"} + expected := Filesystem{"1", 2, 3, 4, "5"} actual := *proc if expected != actual { t.Errorf("Filesystem was incorrectly generated:\n%s != %s", expected, actual)