diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-03-27 22:57:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-27 22:57:58 +0000 |
| commit | 74e80ee20b124c903e693b2db4998f1d238c5f56 (patch) | |
| tree | 13cfe4e350214223be452d40e7a39350cf5ab66a | |
| parent | 792e99f496df5e6643d4cb678d366d2d6f76c78b (diff) | |
| parent | 16573480534b60791eac266e3f22fb9fd18076b5 (diff) | |
| download | tests-74e80ee20b124c903e693b2db4998f1d238c5f56.tar.gz | |
net-test: close() fixes for neighbour_test.py am: 2e0364c6f7 am: 16a7505eec am: bf40f7641a am: 1657348053
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2506774
Change-Id: Ie870a54b0097c95588fc8bef588f81e908ff943e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | net/test/neighbour_test.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/test/neighbour_test.py b/net/test/neighbour_test.py index ac15897..74b1156 100755 --- a/net/test/neighbour_test.py +++ b/net/test/neighbour_test.py @@ -116,6 +116,9 @@ class NeighbourTest(multinetwork_base.MultiNetworkBaseTest): # so as not to affect other tests. self.ChangeRouterNudState(4, NUD_PERMANENT) + self.sock.close() + self.sock = None + def ChangeRouterNudState(self, version, state): router = self._RouterAddress(self.netid, version) macaddr = self.RouterMacAddress(self.netid) @@ -268,6 +271,7 @@ class NeighbourTest(multinetwork_base.MultiNetworkBaseTest): # Send a packet, and verify we go into DELAY and then to PROBE. s.send(net_test.UDP_PAYLOAD) + s.close() self.assertNeighbourState(NUD_DELAY, router6) self.SleepMs(self.DELAY_TIME_MS * 1.1) self.assertNeighbourState(NUD_PROBE, router6) @@ -323,7 +327,7 @@ class NeighbourTest(multinetwork_base.MultiNetworkBaseTest): time.sleep(1) # Send another packet and expect a multicast NS. - self.SendDnsRequest(net_test.IPV6_ADDR) + self.SendDnsRequest(net_test.IPV6_ADDR).close() self.ExpectMulticastNS(router6) # Receive a unicast NA with the R flag set to 0. @@ -351,7 +355,7 @@ class NeighbourTest(multinetwork_base.MultiNetworkBaseTest): self.SetUnicastSolicit(proto, iface, self.UCAST_SOLICIT_LARGE) # Send a packet and check that we go into DELAY. - self.SendDnsRequest(ip_addr) + self.SendDnsRequest(ip_addr).close() self.assertNeighbourState(NUD_DELAY, router) # Probing 4 times but no reponse |