summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Chen <jerrypcchen@google.com>2024-03-21 07:58:59 +0000
committerJerry Chen <jerrypcchen@google.com>2024-03-22 04:09:59 +0000
commit7be04432fc2ce66681c0106c0ea8564b8c53761f (patch)
treefff9993447bce79afd1a159245f9c66a98d295aa
parentd1ea247a2ff6c010b0565d9dca5625ef6b36ede4 (diff)
downloadconnectivity-7be04432fc2ce66681c0106c0ea8564b8c53761f.tar.gz
Remove DHCP discover option checkpoint due to aosp/2943087 change the default behaivor.
Apply from M2024-5. Bug: 330280396 Change-Id: I41414f878de46fb705aa18d1d9a0d1559f0fff30
-rw-r--r--acts_tests/tests/google/net/DhcpTest.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/acts_tests/tests/google/net/DhcpTest.py b/acts_tests/tests/google/net/DhcpTest.py
index 32d265440..87be378ed 100644
--- a/acts_tests/tests/google/net/DhcpTest.py
+++ b/acts_tests/tests/google/net/DhcpTest.py
@@ -90,11 +90,8 @@ class DhcpTest(WifiBaseTest):
def verify_dhcp_packet(self, packets, support_rapid_commit):
for pkt in packets:
if pkt.haslayer(DHCP):
- if pkt[DHCP].options[0][1] == 1:
- send_option = RAPID_COMMIT_OPTION in pkt[DHCP].options
- asserts.assert_true(send_option == support_rapid_commit,
- "Unexpected result in DHCP DISCOVER.")
- elif pkt[DHCP].options[0][1] == 2:
+ # Remove dhcp discover checking since rapid commit enable by default(aosp/2943087).
+ if pkt[DHCP].options[0][1] == 2:
asserts.assert_true(not support_rapid_commit,
"Should not find DHCP OFFER when RAPID_COMMIT_OPTION supported.")
elif pkt[DHCP].options[0][1] == 3: