Browse Source

Merge branch 'testfixes' into 'master'

Testfixes

Fixed some testing issues.

See merge request !10
Ian Adam Naval 5 years ago
parent
commit
dd2578d084
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      Makefile
  2. 2
    2
      common_test.go
  3. 1
    1
      filesystem_test.go

+ 1
- 1
Makefile View File

@@ -4,7 +4,7 @@ GOBUILD=$(GOCMD) build
4 4
 GOCLEAN=$(GOCMD) clean
5 5
 GOINSTALL=$(GOCMD) install
6 6
 GOTEST=$(GOCMD) test
7
-GODEP=$(GOTEST) -i
7
+GODEP=$(GOTEST)
8 8
 GOFMT=gofmt -w
9 9
 GOCOVER=$(GOCMD) tool cover
10 10
 COVER_DIR=cover

+ 2
- 2
common_test.go View File

@@ -3,7 +3,7 @@ package jsh
3 3
 import "testing"
4 4
 
5 5
 func TestToJson(t *testing.T) {
6
-	fixture := JshOutput{[]string{}, []string{}}
6
+	fixture := JshFrame{[]string{}, []string{}}
7 7
 	json := fixture.ToJson()
8 8
 	expected := `{"StdOut":[],"StdErr":[]}`
9 9
 	actual := *json
@@ -11,7 +11,7 @@ func TestToJson(t *testing.T) {
11 11
 		t.Errorf("Empty fixture did not match:\n%s != %s", expected, actual)
12 12
 	}
13 13
 
14
-	fixture = JshOutput{[]string{"potato!"}, []string{}}
14
+	fixture = JshFrame{[]string{"potato!"}, []string{}}
15 15
 	json = fixture.ToJson()
16 16
 	expected = `{"StdOut":["potato!"],"StdErr":[]}`
17 17
 	actual = *json

+ 1
- 1
filesystem_test.go View File

@@ -20,7 +20,7 @@ func TestNewFilesystem(t *testing.T) {
20 20
 	if err != nil {
21 21
 		t.Errorf("Passing 5 strings should not raise an error")
22 22
 	}
23
-	expected := Filesystem{"1", "2", "3", "4", "5"}
23
+	expected := Filesystem{"1", 2, 3, 4, "5"}
24 24
 	actual := *proc
25 25
 	if expected != actual {
26 26
 		t.Errorf("Filesystem was incorrectly generated:\n%s != %s", expected, actual)

Loading…
Cancel
Save