diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-30 15:00:56 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2021-04-02 14:46:18 +0000 |
| commit | 0552a1bbdf3b4df56a32156198a809073d0862f1 (patch) | |
| tree | 119e3442d2c33c69fd67c7ebee337980c0897cd3 | |
| parent | 2cd9b420781b7f10e5620234280384ba78169d01 (diff) | |
| download | tests-0552a1bbdf3b4df56a32156198a809073d0862f1.tar.gz | |
Teardown the testing tunnel in the end of migration tests
This patch makes sure the IPsec tunnel is torn down in the end of
the test so that if one test fails, the following tests won't
be affected.
Bug: 183604054
Test: Manually failed one test and saw following tests passing
Signed-off-by: Yan Yan <evitayan@google.com>
Change-Id: I82bb8796eac69f51e2f9416314e38c3203fc993e
| -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) |