diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-05-10 04:22:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-10 04:22:26 +0000 |
| commit | 9048b4186fa6397ea73df653fbcd329ea2162e30 (patch) | |
| tree | 111d7195627ee549791f86f63e4dac686f7a401f | |
| parent | a9c82cc5e903a924e677adf93d61b96347f9a87c (diff) | |
| parent | fd2a51104e715ad1554088e725f22a555fb2e6f2 (diff) | |
| download | tests-9048b4186fa6397ea73df653fbcd329ea2162e30.tar.gz | |
Merge "Fix srcaddr_selection_test when forwarding is on." into rvc-dev am: 1998f83dff am: fd2a51104e
Change-Id: Ie5f1158e0997ba67e569d4c97f9431d72f1deea3
| -rwxr-xr-x | net/test/srcaddr_selection_test.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/test/srcaddr_selection_test.py b/net/test/srcaddr_selection_test.py index 45a8140..e57ce16 100755 --- a/net/test/srcaddr_selection_test.py +++ b/net/test/srcaddr_selection_test.py @@ -72,6 +72,9 @@ class IPv6SourceAddressSelectionTest(multinetwork_base.MultiNetworkBaseTest): def SetUseOptimistic(self, ifname, value): self.SetSysctl("/proc/sys/net/ipv6/conf/%s/use_optimistic" % ifname, value) + def SetForwarding(self, value): + self.SetSysctl("/proc/sys/net/ipv6/conf/all/forwarding", value) + def GetSourceIP(self, netid, mode="mark"): s = self.BuildSocket(6, net_test.UDPSocket, netid, mode) # Because why not...testing for temporary addresses is a separate thing. @@ -163,6 +166,12 @@ class MultiInterfaceSourceAddressSelectionTest(IPv6SourceAddressSelectionTest): # link-local address is generated. self.WaitForDad(self.test_lladdr) + # Disable forwarding, because optimistic addresses don't work when + # forwarding is on. Forwarding will be re-enabled when the sysctls are + # restored by MultiNetworkBaseTest.tearDownClass. + # TODO: Fix this and remove this hack. + self.SetForwarding("0") + class TentativeAddressTest(MultiInterfaceSourceAddressSelectionTest): |