mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #35 from mrjana/master
Enable libnetwork tests only in short mode
This commit is contained in:
commit
80ae9d3e89
1 changed files with 8 additions and 9 deletions
|
@ -1,8 +1,8 @@
|
||||||
package libnetwork_test
|
package libnetwork_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"flag"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
|
@ -12,16 +12,15 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var bridgeName = "docker0"
|
var bridgeName = "docker0"
|
||||||
|
var enableBridgeTest = flag.Bool("enable-bridge-test", false, "")
|
||||||
func TestMain(m *testing.M) {
|
|
||||||
// Cleanup any existing docker0 bridge if needed. Ignore errors
|
|
||||||
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
|
|
||||||
netlink.LinkDel(bridge)
|
|
||||||
|
|
||||||
os.Exit(m.Run())
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSimplebridge(t *testing.T) {
|
func TestSimplebridge(t *testing.T) {
|
||||||
|
if *enableBridgeTest == false {
|
||||||
|
t.Skip()
|
||||||
|
}
|
||||||
|
|
||||||
|
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
|
||||||
|
netlink.LinkDel(bridge)
|
||||||
|
|
||||||
ip, subnet, err := net.ParseCIDR("192.168.100.1/24")
|
ip, subnet, err := net.ParseCIDR("192.168.100.1/24")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Add table
Reference in a new issue