summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2015-11-09 08:19:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-09 08:19:26 +0000
commite883d56794a07c09eb889e8a1bd51a963c3fc7b2 (patch)
treea53bd8a9c87798ee284d9ed2e4e3aa3295b08639
parent7a280cb2f78961ab245051e777fa354804e5af4a (diff)
parentdf107e30ec072899011a5d02e1ddd67655b7f725 (diff)
downloadextras-e883d56794a07c09eb889e8a1bd51a963c3fc7b2.tar.gz
Merge "Use packets.py instead of old multinetwork_test.Packets"
-rwxr-xr-xtests/net_test/srcaddr_selection_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/net_test/srcaddr_selection_test.py b/tests/net_test/srcaddr_selection_test.py
index 81452953..d3efdd9d 100755
--- a/tests/net_test/srcaddr_selection_test.py
+++ b/tests/net_test/srcaddr_selection_test.py
@@ -25,7 +25,7 @@ from scapy import all as scapy
import csocket
import iproute
import multinetwork_base
-import multinetwork_test
+import packets
import net_test
# Setsockopt values.
@@ -311,7 +311,7 @@ class NoNsFromOptimisticTest(MultiInterfaceSourceAddressSelectionTest):
if net_test.LinuxVersion() >= (3, 18, 0):
# Older versions will actually choose the optimistic address to
# originate Neighbor Solications (RFC violation).
- expected_ns = multinetwork_test.Packets.NS(
+ expected_ns = packets.NS(
self.test_lladdr,
onlink_dest,
self.MyMacAddress(self.test_netid))[1]