lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unflake integration: use different interface name in DHCPv6 test

Browse Source
This commit is contained in:
Michael Stapelberg 2018-06-24 08:33:39 +02:00
parent c96c683e43
commit 2ff269bf67
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integrationdhcpv4_test.go
View File

@ -33,6 +33,7 @@ func TestDHCPv4(t *testing.T) {
} }
for _, cmd := range nsSetup { for _, cmd := range nsSetup {
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
t.Fatalf("%v: %v", cmd.Args, err) t.Fatalf("%v: %v", cmd.Args, err)
} }
@ -45,7 +46,7 @@ func TestDHCPv4(t *testing.T) {
ready.Close() // dnsmasq will re-create the file anyway ready.Close() // dnsmasq will re-create the file anyway
defer os.Remove(ready.Name()) // dnsmasq does not clean up its pid file defer os.Remove(ready.Name()) // dnsmasq does not clean up its pid file
dnsmasq := dnsmasq.Run(t) dnsmasq := dnsmasq.Run(t, "veth0b")
defer dnsmasq.Kill() defer dnsmasq.Kill()
// f, err := os.Create("/tmp/pcap") // f, err := os.Create("/tmp/pcap")

30
integrationdhcpv6_test.go
View File

@ -1,6 +1,7 @@
package integration_test package integration_test
import ( import (
"os"
"os/exec" "os/exec"
"regexp" "regexp"
"strings" "strings"
@ -23,27 +24,28 @@ func TestDHCPv6(t *testing.T) {
defer exec.Command("ip", "netns", "delete", ns).Run() defer exec.Command("ip", "netns", "delete", ns).Run()
nsSetup := []*exec.Cmd{ nsSetup := []*exec.Cmd{
exec.Command("ip", "link", "add", "veth0a", "type", "veth", "peer", "name", "veth0b", "netns", ns), exec.Command("ip", "link", "add", "veth1a", "type", "veth", "peer", "name", "veth1b", "netns", ns),
// Disable Duplicate Address Detection: until DAD completes, the link-local // Disable Duplicate Address Detection: until DAD completes, the link-local
// address remains in state “tentative”, resulting in any attempts to // address remains in state “tentative”, resulting in any attempts to
// bind(2) to the address to fail with -EADDRNOTAVAIL. // bind(2) to the address to fail with -EADDRNOTAVAIL.
exec.Command("/bin/sh", "-c", "echo 0 > /proc/sys/net/ipv6/conf/veth0a/accept_dad"), exec.Command("/bin/sh", "-c", "echo 0 > /proc/sys/net/ipv6/conf/veth1a/accept_dad"),
exec.Command("ip", "netns", "exec", ns, "/bin/sh", "-c", "echo 0 > /proc/sys/net/ipv6/conf/veth0b/accept_dad"), exec.Command("ip", "netns", "exec", ns, "/bin/sh", "-c", "echo 0 > /proc/sys/net/ipv6/conf/veth1b/accept_dad"),
exec.Command("ip", "link", "set", "veth0a", "up"), exec.Command("ip", "link", "set", "veth1a", "up"),
exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "192.168.23.1/24", "dev", "veth0b"), exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "192.168.23.1/24", "dev", "veth1b"),
exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "2001:db8::1/64", "dev", "veth0b"), exec.Command("ip", "netns", "exec", ns, "ip", "addr", "add", "2001:db8::1/64", "dev", "veth1b"),
exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth0b", "up"), exec.Command("ip", "netns", "exec", ns, "ip", "link", "set", "veth1b", "up"),
} }
for _, cmd := range nsSetup { for _, cmd := range nsSetup {
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
t.Fatalf("%v: %v", cmd.Args, err) t.Fatalf("%v: %v", cmd.Args, err)
} }
} }
dnsmasq := dnsmasq.Run(t) dnsmasq := dnsmasq.Run(t, "veth1b")
defer dnsmasq.Kill() defer dnsmasq.Kill()
// f, err := os.Create("/tmp/pcap6") // f, err := os.Create("/tmp/pcap6")
@ -81,7 +83,7 @@ func TestDHCPv6(t *testing.T) {
duid := []byte{0x00, 0x0a, 0x00, 0x03, 0x00, 0x01, 0x4c, 0x5e, 0xc, 0x41, 0xbf, 0x39} duid := []byte{0x00, 0x0a, 0x00, 0x03, 0x00, 0x01, 0x4c, 0x5e, 0xc, 0x41, 0xbf, 0x39}
c, err := dhcp6.NewClient(dhcp6.ClientConfig{ c, err := dhcp6.NewClient(dhcp6.ClientConfig{
InterfaceName: "veth0a", InterfaceName: "veth1a",
DUID: duid, DUID: duid,
}) })
if err != nil { if err != nil {
@ -105,11 +107,11 @@ func TestDHCPv6(t *testing.T) {
dnsmasq.Kill() // flush log dnsmasq.Kill() // flush log
got := dnsmasq.Actions() got := dnsmasq.Actions()
want := []string{ want := []string{
"DHCPSOLICIT(veth0b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39", "DHCPSOLICIT(veth1b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39",
"DHCPADVERTISE(veth0b) 2001:db8::c 00:0a:00:03:00:01:4c:5e:0c:41:bf:39", "DHCPADVERTISE(veth1b) 2001:db8::c 00:0a:00:03:00:01:4c:5e:0c:41:bf:39",
"DHCPREQUEST(veth0b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39", "DHCPREQUEST(veth1b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39",
"DHCPREPLY(veth0b) 2001:db8::c 00:0a:00:03:00:01:4c:5e:0c:41:bf:39", "DHCPREPLY(veth1b) 2001:db8::c 00:0a:00:03:00:01:4c:5e:0c:41:bf:39",
"DHCPRELEASE(veth0b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39", "DHCPRELEASE(veth1b) 00:0a:00:03:00:01:4c:5e:0c:41:bf:39",
} }
withoutMac := func(line string) string { withoutMac := func(line string) string {
return v6AddrRe.ReplaceAllString(strings.TrimSpace(line), "") return v6AddrRe.ReplaceAllString(strings.TrimSpace(line), "")

6
internal/testing/dnsmasq/dnsmasq.go
View File

@ -30,7 +30,7 @@ type Process struct {
var dhcpActionRe = regexp.MustCompile(` (DHCP[^(]+\(.*)$`) var dhcpActionRe = regexp.MustCompile(` (DHCP[^(]+\(.*)$`)
// Run starts a dnsmasq(8) process and returns a handle to it. // Run starts a dnsmasq(8) process and returns a handle to it.
func Run(t *testing.T, args ...string) *Process { func Run(t *testing.T, iface string) *Process {
const ns = "ns0" // TODO: configurable? const ns = "ns0" // TODO: configurable?
ready, err := ioutil.TempFile("", "router7") ready, err := ioutil.TempFile("", "router7")
@ -54,9 +54,9 @@ func Run(t *testing.T, args ...string) *Process {
"--log-facility=-", // log to stderr "--log-facility=-", // log to stderr
"--pid-file="+ready.Name(), "--pid-file="+ready.Name(),
"--bind-interfaces", "--bind-interfaces",
"--interface=veth0b", "--interface="+iface,
"--dhcp-range=192.168.23.2,192.168.23.10", "--dhcp-range=192.168.23.2,192.168.23.10",
"--dhcp-range=::1,::10,constructor:veth0b", "--dhcp-range=::1,::10,constructor:"+iface,
"--dhcp-authoritative", // eliminate timeouts "--dhcp-authoritative", // eliminate timeouts
"--no-ping", // disable ICMP confirmation of unused addresses to eliminate tedious timeout "--no-ping", // disable ICMP confirmation of unused addresses to eliminate tedious timeout
"--leasefile-ro", // do not create a lease database "--leasefile-ro", // do not create a lease database

2
internal/testing/dnsmasq/example_test.go
View File

@ -9,7 +9,7 @@ import (
) )
func Example(t *testing.T) { func Example(t *testing.T) {
dnsmasq := dnsmasq.Run(t) dnsmasq := dnsmasq.Run(t, "veth0b")
defer dnsmasq.Kill() defer dnsmasq.Kill()
// test code here // test code here