Skip to content

Commit db03bce

Browse files
author
shaleman
committed
fix a testcase
1 parent dbb7263 commit db03bce

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ all: build unit-test system-test system-test-dind centos-tests
2626
# sandbox specific(vagrant, docker-in-docker)
2727
all-CI: build unit-test system-test
2828

29+
test: build unit-test system-test centos-tests
30+
2931
default: build
3032

3133
deps:
@@ -48,6 +50,7 @@ build:
4850

4951
clean: deps
5052
rm -rf Godeps/_workspace/pkg
53+
rm -rf $(GOPATH)/pkg
5154
godep go clean -i -v ./...
5255

5356
update:
@@ -78,8 +81,8 @@ ssh:
7881
unit-test: stop clean build
7982
./scripts/unittests -vagrant
8083

81-
unit-test-centos: stop clean
82-
CONTIV_NODE_OS=centos make build
84+
unit-test-centos: stop
85+
CONTIV_NODE_OS=centos make clean build
8386
CONTIV_NODE_OS=centos ./scripts/unittests -vagrant
8487

8588
# setting CONTIV_SOE=1 while calling 'make system-test' will stop the test

systemtests/utils/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func StartNetPlugin(t *testing.T, nodes []stu.TestbedNode, nativeInteg bool) {
153153
}
154154

155155
// StartNetmasterWithFlags starts netplugin on specified testbed nodes with specified flags
156-
func StartNetmasterWithFlags(t *testing.T, node TestbedNode, flags map[string]string) {
156+
func StartNetmasterWithFlags(t *testing.T, node stu.TestbedNode, flags map[string]string) {
157157
time.Sleep(5 * time.Second)
158158

159159
var (

0 commit comments

Comments
 (0)