diff options
| author | Yan Yan <evitayan@google.com> | 2021-04-02 16:10:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 16:10:24 +0000 |
| commit | 66ed2acd4f6359d77cfad603fce90ebd15730edf (patch) | |
| tree | 119e3442d2c33c69fd67c7ebee337980c0897cd3 | |
| parent | a22161c49b7a74060d3be0b3282cdc4b9b6d9b78 (diff) | |
| parent | 27308eafe35ffa51d9e9737a1a9e3aa229738dff (diff) | |
| download | tests-66ed2acd4f6359d77cfad603fce90ebd15730edf.tar.gz | |
Teardown the testing tunnel in the end of migration tests am: 0552a1bbdf am: 27308eafe3
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1659294
Change-Id: I95d68a6061fe429965eb49a1135d2e1c72e69829
| -rwxr-xr-x | net/test/xfrm_tunnel_test.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/net/test/xfrm_tunnel_test.py b/net/test/xfrm_tunnel_test.py index 7497ea2..e319a7d 100755 --- a/net/test/xfrm_tunnel_test.py +++ b/net/test/xfrm_tunnel_test.py @@ -1044,25 +1044,26 @@ class XfrmInterfaceMigrateTest(XfrmTunnelBase): tunnel.Teardown() def _TestTunnel(self, inner_version, outer_version, func, use_null_crypt): - tunnel = self.setUpTunnel(outer_version, use_null_crypt) - - # Verify functionality before migration - local_inner = tunnel.addrs[inner_version] - remote_inner = _GetRemoteInnerAddress(inner_version) - func(tunnel, inner_version, local_inner, remote_inner) + try: + tunnel = self.setUpTunnel(outer_version, use_null_crypt) - # Migrate tunnel - # TODO:b/169170981 Add tests that migrate 4 -> 6 and 6 -> 4 - new_underlying_netid = self.RandomNetid(exclude=tunnel.underlying_netid) - new_local = self.MyAddress(outer_version, new_underlying_netid) - new_remote = net_test.IPV4_ADDR2 if outer_version == 4 else net_test.IPV6_ADDR2 + # Verify functionality before migration + local_inner = tunnel.addrs[inner_version] + remote_inner = _GetRemoteInnerAddress(inner_version) + func(tunnel, inner_version, local_inner, remote_inner) - tunnel.Migrate(new_underlying_netid, new_local, new_remote) + # Migrate tunnel + # TODO:b/169170981 Add tests that migrate 4 -> 6 and 6 -> 4 + new_underlying_netid = self.RandomNetid(exclude=tunnel.underlying_netid) + new_local = self.MyAddress(outer_version, new_underlying_netid) + new_remote = net_test.IPV4_ADDR2 if outer_version == 4 else net_test.IPV6_ADDR2 - # Verify functionality after migration - func(tunnel, inner_version, local_inner, remote_inner) + tunnel.Migrate(new_underlying_netid, new_local, new_remote) - self.tearDownTunnel(tunnel) + # Verify functionality after migration + func(tunnel, inner_version, local_inner, remote_inner) + finally: + self.tearDownTunnel(tunnel) def ParamTestMigrateXfrmIntfInput(self, inner_version, outer_version): self._TestTunnel(inner_version, outer_version, self._CheckTunnelInput, True) |