diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-30 03:17:40 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-30 03:17:40 +0000 |
commit | e4ceb75b28ce4968b2e335e035544d242fc0ab42 (patch) | |
tree | 02655f29619ed06cf48fa53aaecf032fb3fed0da | |
parent | 777b177c6ff6583cee0665682e1f95c99f38d9b6 (diff) | |
parent | fc4ca0f83ce236c4ea620877e1bd138f3c8bc9e0 (diff) | |
download | tests-android10-c2f2-s2-release.tar.gz |
Snap for 5764972 from fc4ca0f83ce236c4ea620877e1bd138f3c8bc9e0 to qt-c2f2-releaseandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Change-Id: I153061f27456057767ae21f0b9beea0b5482721d
-rwxr-xr-x | net/test/xfrm_test.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/net/test/xfrm_test.py b/net/test/xfrm_test.py index afcacde..64be084 100755 --- a/net/test/xfrm_test.py +++ b/net/test/xfrm_test.py @@ -846,12 +846,22 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): xfrm_base._ALGO_CBC_AES_256) # Add a default SA with no mark that routes to nowhere. - self.xfrm.AddSaInfo(local, - remote, - TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, - xfrm_base._ALGO_CBC_AES_256, - xfrm_base._ALGO_HMAC_SHA1, - None, None, None, 0, is_update=False) + try: + self.xfrm.AddSaInfo(local, + remote, + TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, + xfrm_base._ALGO_CBC_AES_256, + xfrm_base._ALGO_HMAC_SHA1, + None, None, mark, 0, is_update=False) + except IOError as e: + self.assertEquals(EEXIST, e.errno, "SA exists") + self.xfrm.AddSaInfo(local, + remote, + TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, + xfrm_base._ALGO_CBC_AES_256, + xfrm_base._ALGO_HMAC_SHA1, + None, None, mark, 0, is_update=True) + self.assertRaisesErrno( ENETUNREACH, s.sendto, net_test.UDP_PAYLOAD, (remote, 53)) @@ -862,7 +872,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, xfrm_base._ALGO_CBC_AES_256, xfrm_base._ALGO_HMAC_SHA1, - None, None, None, netid, is_update=True) + None, None, mark, netid, is_update=True) # Now the payload routes to the updated netid. s.sendto(net_test.UDP_PAYLOAD, (remote, 53)) @@ -876,7 +886,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): TEST_SPI, xfrm.XFRM_MODE_TUNNEL, 0, xfrm_base._ALGO_CBC_AES_256, xfrm_base._ALGO_HMAC_SHA1, - None, None, None, reroute_netid, is_update=True) + None, None, mark, reroute_netid, is_update=True) s.sendto(net_test.UDP_PAYLOAD, (remote, 53)) self._ExpectEspPacketOn(reroute_netid, TEST_SPI, 2, length, None, None) @@ -887,7 +897,7 @@ class XfrmOutputMarkTest(xfrm_base.XfrmLazyTest): sainfo, attributes = dump[0] self.assertEquals(reroute_netid, attributes["XFRMA_OUTPUT_MARK"]) - self.xfrm.DeleteSaInfo(remote, TEST_SPI, IPPROTO_ESP, None) + self.xfrm.DeleteSaInfo(remote, TEST_SPI, IPPROTO_ESP, mark) self.xfrm.DeletePolicyInfo(sel, xfrm.XFRM_POLICY_OUT, mark) if __name__ == "__main__": |