Skip to content

Commit 840bef4

Browse files
author
Erik Hollensbe
committed
Merge pull request #143 from contiv/remove-systemtest-utils
Godeps,systemtests/utils: replace systemtests/utils with the new systemtests-utils repo.
2 parents da9d00d + bee33c5 commit 840bef4

File tree

20 files changed

+46
-112
lines changed

20 files changed

+46
-112
lines changed

‎Godeps/Godeps.json

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎systemtests/utils/dind.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/dind.go

+16-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎systemtests/utils/dindnode.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/dindnode.go

File renamed without changes.

‎systemtests/utils/docker.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/docker.go

File renamed without changes.

‎systemtests/utils/ovs.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/ovs.go

File renamed without changes.

‎systemtests/utils/tempfile.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/tempfile.go

File renamed without changes.

‎systemtests/utils/testbed.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/testbed.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎systemtests/utils/testbednode.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/testbednode.go

File renamed without changes.

‎systemtests/utils/testcommand.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/testcommand.go

File renamed without changes.

‎systemtests/utils/utils.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/utils.go

File renamed without changes.

‎systemtests/utils/vagrant.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/vagrant.go

+17-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎systemtests/utils/vagrantcommand.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/vagrantcommand.go

File renamed without changes.

‎systemtests/utils/vagrantnode.go ‎Godeps/_workspace/src/github.com/contiv/systemtests-utils/vagrantnode.go

File renamed without changes.

‎Godeps/_workspace/src/github.com/mapuri/libnetwork/driverapi/driverapi.go

-78
This file was deleted.

‎systemtests/singlehost/regression_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"io/ioutil"
2020
"testing"
2121

22-
"github.com/contiv/netplugin/systemtests/utils"
2322
u "github.com/contiv/netplugin/utils"
23+
utils "github.com/contiv/systemtests-utils"
2424
)
2525

2626
func TestOneHostMultipleNets_regress(t *testing.T) {

‎systemtests/singlehost/sanity_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package singlehost
1818
import (
1919
"testing"
2020

21-
"github.com/contiv/netplugin/systemtests/utils"
2221
u "github.com/contiv/netplugin/utils"
22+
utils "github.com/contiv/systemtests-utils"
2323
)
2424

2525
// Testcase:

‎systemtests/singlehost/setup_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
"github.com/contiv/netplugin/systemtests/utils"
22+
utils "github.com/contiv/systemtests-utils"
2323

2424
log "github.com/Sirupsen/logrus"
2525
)
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
3434
testbed = &utils.Vagrant{}
3535
}
3636
log.Printf("Starting testbed setup...")
37-
err := testbed.Setup(os.Getenv("CONTIV_ENV"), 1)
37+
err := testbed.Setup(true, os.Getenv("CONTIV_ENV"), 1)
3838
log.Printf("Done with testbed setup...")
3939
if err != nil {
4040
testbed.Teardown()

‎systemtests/twohosts/regression_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"io/ioutil"
2020
"testing"
2121

22-
"github.com/contiv/netplugin/systemtests/utils"
2322
u "github.com/contiv/netplugin/utils"
23+
utils "github.com/contiv/systemtests-utils"
2424
)
2525

2626
func TestMultipleEpsInContainer_regress(t *testing.T) {

‎systemtests/twohosts/sanity_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"testing"
2020
"time"
2121

22-
"github.com/contiv/netplugin/systemtests/utils"
2322
u "github.com/contiv/netplugin/utils"
23+
utils "github.com/contiv/systemtests-utils"
2424
)
2525

2626
func TestTwoHostsSingleVlanPingSuccess_sanity(t *testing.T) {

‎systemtests/twohosts/setup_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
"github.com/contiv/netplugin/systemtests/utils"
22+
utils "github.com/contiv/systemtests-utils"
2323

2424
log "github.com/Sirupsen/logrus"
2525
)
@@ -33,7 +33,7 @@ func TestMain(m *testing.M) {
3333
testbed = &utils.Vagrant{}
3434
}
3535
log.Printf("Starting testbed setup...")
36-
err := testbed.Setup(os.Getenv("CONTIV_ENV"), 2)
36+
err := testbed.Setup(true, os.Getenv("CONTIV_ENV"), 2)
3737
log.Printf("Done with testbed setup...")
3838
if err != nil {
3939
testbed.Teardown()

0 commit comments

Comments
 (0)