Commit Graph

6307 Commits

Author SHA1 Message Date
TreeHugger Robot
74401f6bc2 [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours am: 1e1e07e884 -s ours am: 16f9ef4fca -s ours am: 63eb931f6d -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 ec38685a7f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I0234a0d61d72e6297ee36357fbd167ad92e1b651
2020-06-16 10:04:11 +00:00
TreeHugger Robot
2a20d02a5e [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 am: 0a6db8a062 -s ours am: 69be16212d -s ours am: 14f9ea6b2c -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I47031ac70f10a700f5bd8502f1496347408bb5c9
2020-06-16 10:02:06 +00:00
TreeHugger Robot
63eb931f6d [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours am: 1e1e07e884 -s ours am: 16f9ef4fca -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 ec38685a7f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I95e97ee740f3862e42f6f4ef0b2c01afd770210e
2020-06-16 09:48:18 +00:00
TreeHugger Robot
14f9ea6b2c [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 am: 0a6db8a062 -s ours am: 69be16212d -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I0d8bfca295b67ea7f4dd0d1d6b0b2f28b8beca7a
2020-06-16 09:47:16 +00:00
TreeHugger Robot
16f9ef4fca [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours am: 1e1e07e884 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 ec38685a7f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I0a0541948c74af7e76ae25fa7c8a69f45323194c
2020-06-16 09:44:47 +00:00
TreeHugger Robot
69be16212d [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 am: 0a6db8a062 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I9eb47e31b6f740d3ee20ea0510ea1ab383d5960b
2020-06-16 09:38:22 +00:00
TreeHugger Robot
1e1e07e884 [automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I00d4a6bc63ff9489a732d404769018bd69b031bc
2020-06-16 09:25:56 +00:00
TreeHugger Robot
0a6db8a062 Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009

Change-Id: I63be8cdebe4b8ba19251600a12b02a496384fe13
2020-06-16 09:23:18 +00:00
TreeHugger Robot
3cc6da3e61 Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev 2020-06-16 09:09:17 +00:00
Treehugger Robot
ec38685a7f Toggle wifi when running CaptivePortalTest
Instead of reconnecting without disabling/re-enabling wifi in
CaptivePortalTest, actually do the toggle during the test and
on teardown to ensure that the BSSID blacklist is cleared.

CaptivePortalTest intentionally makes the network not validate, which
causes it to be added to the BSSID blacklist. Toggling wifi is necessary
to make sure the test does not affect other tests.

Also check development SDK instead of the exact SDK_INT number so that
the test can pass on current AOSP builds.

Bug: 158924461
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest \
          CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1336114
Merged-In: I31f9f4a9678e11042005c29535af840246358764
Change-Id: I31f9f4a9678e11042005c29535af840246358764
2020-06-16 16:53:25 +09:00
Treehugger Robot
ffe449ac54 Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d am: 909eeeed43 am: 73f9a5063b am: a1c99d2018
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: If915365510cdd47b6c4796ddce01fa0999114192
2020-06-16 01:53:51 +00:00
Treehugger Robot
a1c99d2018 Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d am: 909eeeed43 am: 73f9a5063b
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: I9dbe69849821a4e5d0143e26a9e7e42be2fbac23
2020-06-16 01:44:32 +00:00
Treehugger Robot
73f9a5063b Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d am: 909eeeed43
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: Ie296e013b970c43ac3bd9d79be97c55b844ab49e
2020-06-16 01:29:50 +00:00
Treehugger Robot
909eeeed43 Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6 am: 5f38f3067d
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: Id369a526b18d70fdb72a5dcaf12092d6085efe27
2020-06-16 01:16:18 +00:00
Treehugger Robot
5f38f3067d Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6
Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: I4a878a7d328a7a001355e092b81e1e3635dcb853
2020-06-16 00:59:52 +00:00
Treehugger Robot
1ae290c1a6 Merge "Toggle wifi when running CaptivePortalTest" 2020-06-16 00:43:07 +00:00
Benedict Wong
82dc776f15 Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9 am: ed0ddfc96c am: 8324c6660c am: b27aadc00e
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: I6b582289688dbfa40f6b3f4bce4244527271346d
2020-06-15 17:54:29 +00:00
Benedict Wong
b27aadc00e Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9 am: ed0ddfc96c am: 8324c6660c
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: Icbf6df62f6ec06d7bbe3198af539b20e58d48bb7
2020-06-15 17:44:11 +00:00
Automerger Merge Worker
3f61ebfe01 Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp am: d40742b7fb -s ours am: 418c86df16 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 dfd08cab51 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: If58b8657202371c734be7b2a5f75b25584439b76
2020-06-15 17:43:23 +00:00
Yan Yan
a196edfe0b [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours am: b3bf07b6b3 -s ours am: c014e8c450 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ib3670166ee8c2e544bdcc149705cbbc681499821
2020-06-15 17:43:04 +00:00
Benedict Wong
8324c6660c Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9 am: ed0ddfc96c
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: I7a2f5903cf6e5e99f230963c932266a2147bea15
2020-06-15 17:38:17 +00:00
Benedict Wong
ed0ddfc96c Merge "Verify owner of IKEv2 VPNs" am: a330e50192 am: 7f63ec96d9
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: Ib77195b5116622e42730d1e25ed48c3fcbbeaa36
2020-06-15 17:33:32 +00:00
Automerger Merge Worker
418c86df16 Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp am: d40742b7fb -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 dfd08cab51 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Idd289cb516297e231c4c9c8b86ab91a574c2407e
2020-06-15 17:30:22 +00:00
Yan Yan
c014e8c450 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours am: b3bf07b6b3 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I0823a523f0c44b30b6db04ab21bc466d2b4b1d25
2020-06-15 17:30:15 +00:00
Automerger Merge Worker
d40742b7fb Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp 2020-06-15 17:19:05 +00:00
Yan Yan
e68a74ad49 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ie657ef6aca17b9af21b7eee1e3ef3df4fffeaea0
2020-06-15 17:18:59 +00:00
Yan Yan
b3bf07b6b3 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ic1bdae74c4307f46feae04a4de951520d436a9cf
2020-06-15 17:18:57 +00:00
Benedict Wong
7f63ec96d9 Merge "Verify owner of IKEv2 VPNs" am: a330e50192
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326393

Change-Id: Ia3e9f26c6e28fa02b25b3098fbda98c2bf07c2bf
2020-06-15 17:18:15 +00:00
Benedict Wong
a330e50192 Merge "Verify owner of IKEv2 VPNs" 2020-06-15 17:09:46 +00:00
Yan Yan
b12f23f68a Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I9a472d7fb0610439f6d753bb22f302a1d754fd50
2020-06-15 17:05:11 +00:00
Yan Yan
5cf96925d2 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I4379b1f57e74d5cb10dbabf57c6245c73a8b7c29
2020-06-15 17:05:09 +00:00
Yan Yan
91e4a69abe Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev 2020-06-15 17:03:23 +00:00
Automerger Merge Worker
d5f988ebdf Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours" into rvc-qpr-dev-plus-aosp am: 4cb05468ee -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I7bc16926335e9ba969d5bdb306d2148485d27064
2020-06-15 14:30:33 +00:00
Automerger Merge Worker
fb8fa268a5 Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours" into rvc-qpr-dev-plus-aosp am: 7178cff10a -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: If7436d22e588264d78480f18312c6475de6b18d8
2020-06-15 14:29:13 +00:00
Treehugger Robot
efd93dce11 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours am: cd011d8048 -s ours am: 345750862b -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: If75a810be7316855e06d55c6051ef201c795c9a2
2020-06-15 14:28:20 +00:00
Automerger Merge Worker
4cb05468ee Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours" into rvc-qpr-dev-plus-aosp 2020-06-15 14:11:48 +00:00
Automerger Merge Worker
7178cff10a Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours" into rvc-qpr-dev-plus-aosp 2020-06-15 14:11:45 +00:00
Treehugger Robot
5050b6542c [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ia5bd2eb0c467e7757e62d66fea938e3950bd8f96
2020-06-15 14:11:44 +00:00
Treehugger Robot
99793f255e [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Iaf3c713a9f8d399589e18bfd8fc2f541bd89e9bb
2020-06-15 14:11:38 +00:00
Treehugger Robot
345750862b [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours am: cd011d8048 -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I2afd39c9b7ff6e3d8343407448e5040fe60ac9b4
2020-06-15 14:11:32 +00:00
Treehugger Robot
e7cf109b3e [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Iee403b18ad68d5e1cb314abfc8f0e29f30fb6000
2020-06-15 13:58:50 +00:00
Treehugger Robot
cd011d8048 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I0c9aad45309fa76f3945549ee8a1bed50d60f20f
2020-06-15 13:58:42 +00:00
Treehugger Robot
ef7d1e44ca Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ic930dd7826e5ba1169374c278dc67ea4fa799447
2020-06-15 13:47:29 +00:00
Treehugger Robot
b49bc69af3 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I59264cbfcd41a0e5382a41ba6cbb1096cfcea15e
2020-06-15 13:47:27 +00:00
TreeHugger Robot
d43a5f4f0c Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: b857d32541 am: a8af6b2389
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ib55b6813dbfcdab5c74b82c5455038bbda644dc5
2020-06-15 12:22:21 +00:00
TreeHugger Robot
a8af6b2389 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: b857d32541
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I15ea442b8b3701ca16e0c22710d629c6d2e55095
2020-06-15 12:17:15 +00:00
TreeHugger Robot
e4cd2ac152 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6 am: 9ba6fb6829 am: ea017b639a
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ie36bd54f929d2589f6cf8b21e30e9429ec2240bf
2020-06-15 12:16:52 +00:00
TreeHugger Robot
ea017b639a Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6 am: 9ba6fb6829
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Iba4adbfaf2d81a26d8737b2c72e856bdd433099b
2020-06-15 12:16:37 +00:00
TreeHugger Robot
2e0648a758 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: 3d5228c19d am: eff4bb36ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I2c78a6eb6b2511f026af622f64b7c7c5246291ba
2020-06-15 12:16:33 +00:00
TreeHugger Robot
eff4bb36ab Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: 3d5228c19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I2b2853be306c9b761e93fa41094fd1e849e26335
2020-06-15 12:04:01 +00:00