diff options
| author | Erik Kline <ek@google.com> | 2015-11-09 08:20:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 08:20:38 +0000 |
| commit | 8b753f80219a639f0c9a9b571f9b6f86ae5ec00a (patch) | |
| tree | 60af5b3e163bcd375841a4dcd7b85a6ac73f85e3 | |
| parent | d20f2dcde2c777e468258ca71303404638a0ae0d (diff) | |
| parent | e883d56794a07c09eb889e8a1bd51a963c3fc7b2 (diff) | |
| download | extras-8b753f80219a639f0c9a9b571f9b6f86ae5ec00a.tar.gz | |
Merge "Use packets.py instead of old multinetwork_test.Packets"
am: e883d56794
* commit 'e883d56794a07c09eb889e8a1bd51a963c3fc7b2':
Use packets.py instead of old multinetwork_test.Packets
| -rwxr-xr-x | tests/net_test/srcaddr_selection_test.py | 4 |
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] |