diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-04-14 15:07:05 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2015-02-02 17:47:25 +0900 |
| commit | 71324fb493cb2225ec4f957033240af1a827f0a7 (patch) | |
| tree | fe28c8dd5b56e484f7070aa4d0f969792c59f65c | |
| parent | 98eb6fdc5f8dc40f3923680cb6a5f38d96b15816 (diff) | |
| download | extras-71324fb493cb2225ec4f957033240af1a827f0a7.tar.gz | |
Really disable DAD, and get rid of the sleeps.
Change-Id: I9209549e265921f18f68fd10b305b51e192e90f2
| -rwxr-xr-x | tests/net_test/mark_test.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/net_test/mark_test.py b/tests/net_test/mark_test.py index 784512c0..4a931a03 100755 --- a/tests/net_test/mark_test.py +++ b/tests/net_test/mark_test.py @@ -295,7 +295,7 @@ class MultiNetworkTest(net_test.NetworkTest): # Give ourselves a predictable MAC address. net_test.SetInterfaceHWAddr(iface, cls.MyMacAddress(netid)) # Disable DAD so we don't have to wait for it. - open("/proc/sys/net/ipv6/conf/%s/dad_transmits" % iface, "w").write("0") + cls.SetSysctl("/proc/sys/net/ipv6/conf/%s/accept_dad" % iface, 0) net_test.SetInterfaceUp(iface) net_test.SetNonBlocking(f) return f @@ -401,7 +401,10 @@ class MultiNetworkTest(net_test.NetworkTest): @classmethod def _RestoreSysctls(cls): for sysctl, value in cls.saved_sysctls.iteritems(): - open(sysctl, "w").write(value) + try: + open(sysctl, "w").write(value) + except IOError: + pass @classmethod def _ICMPRatelimitFilename(cls, version): @@ -990,11 +993,6 @@ class PMTUTest(MultiNetworkTest): self.assertEquals(1500, self.GetSocketMTU(s)) self.ClearTunQueues() - # XXX why is this needed? It seems that if this is not there, the packet - # won't even make it to icmpv6_rcv. Perhaps the local delivery route for - # our IP address has not been set up yet? But why should that take 0.5s? - # DAD is disabled, so we're not waiting for DAD... - time.sleep(0.5) s.send(1400 * "a") packets = self.ReadAllPacketsOn(netid) self.assertEquals(1, len(packets)) |