Treehugger Robot
48723f3ced
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe am: bc29f21cfd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I33c41bcbb4f5f8641450e8f59a66071a82a689cb
2021-10-13 08:11:44 +00:00
Treehugger Robot
bc29f21cfd
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: Ied6f3c44b899f23eb9544d2d98b14ce0c1fd2dbf
2021-10-13 07:57:19 +00:00
Treehugger Robot
d4c5e13ebe
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I57bd2a913cc23370ad064054b41cb29c68b80d46
2021-10-13 07:37:44 +00:00
Treehugger Robot
6b6d2eb75b
Merge "Ignore testRestrictedNetworkPermission on Q"
2021-10-13 07:01:33 +00:00
Treehugger Robot
878abac790
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e am: 4178cb45dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I8b78f198353876207a0bf5d1f7c366f9b6d8d7ad
2021-10-06 09:36:51 +00:00
Treehugger Robot
4178cb45dd
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I32c32b72233d66a7f4510618d33b4d5905a3f552
2021-10-06 09:21:19 +00:00
Treehugger Robot
039876779e
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I595116f9996eca55f60708bfb817577a8b5b624b
2021-10-06 09:10:33 +00:00
Treehugger Robot
6e1c375f50
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I3ae21d9b034e455ba48d9576712a102ccda0f647
2021-10-06 08:52:12 +00:00
steven_fann
fa8dbc5da7
Support wifi and ethernet connection for DnsResolverTest.
...
Issue: 199675828
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ie1c7522426314ccc83008b75f90a57f3a53339d4
2021-10-05 15:36:35 +08:00
Treehugger Robot
343d04c64b
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94 am: 1ba78e5f40
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: I8d11e13920630c8acd217f2cb24e70733987dd52
2021-10-04 11:32:59 +00:00
Treehugger Robot
1ba78e5f40
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: If59c8212bea518255d34ffd59cafe8976f30cf41
2021-10-04 11:24:14 +00:00
Treehugger Robot
b13c54fd94
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: Iaa8fcbb24c252c53c90af85999be6f205979b322
2021-10-04 11:11:12 +00:00
Treehugger Robot
b370da94ec
Merge "Increase timeouts for loopers" am: 2ed9b3dc70
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: I8062108d1faf53bf9efbfb947f3238f02b7cf34f
2021-10-04 10:58:27 +00:00
Treehugger Robot
2ed9b3dc70
Merge "Increase timeouts for loopers"
2021-10-04 10:42:59 +00:00
Treehugger Robot
7d841ca67d
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 am: da756e286b am: b4218b8d31
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: Ib9e85aebf8a36d761230a1196bc406bc1f701d32
2021-10-04 10:37:00 +00:00
Treehugger Robot
b4218b8d31
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 am: da756e286b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I2fe9c251e694fa8493df2287d6c95125f401c17f
2021-10-04 10:22:58 +00:00
Treehugger Robot
da756e286b
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I54a2b95d21f8655c0268d351a4e27b54a2bce579
2021-10-04 10:11:04 +00:00
Treehugger Robot
7366c89d64
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I9197503f4f19748824ab3cc1efc8d540779399ec
2021-10-04 10:00:40 +00:00
Treehugger Robot
f697c61406
Merge "Remove "when" usage in ConnectivityServiceTest"
2021-10-04 09:42:47 +00:00
Chalard Jean
1afb2e33e2
Increase timeouts for loopers
...
In coverage tests this seems to randomly fail, which suggests
some delay. Have a constant for timeout and increase its value
significantly where it makes no functional difference.
Test: FrameworksNetTests
Change-Id: I035d865f01688daf3bce30c5130ce550fa84b885
2021-10-04 18:02:17 +09:00
Aaron Huang
e75927b122
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c am: c502fa51d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Ic342b4ecb4541c1e58200112dc5bc092b9ab8f2f
2021-10-04 08:46:40 +00:00
Aaron Huang
c502fa51d4
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Ia6bee67074b9ecfe87a3ba11d16b0f7ff3b392c9
2021-10-04 08:32:16 +00:00
Aaron Huang
3820c8b69c
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Id1819e5f4af41d325c1269dedb21347693314841
2021-10-04 08:21:10 +00:00
Aaron Huang
045f47bc31
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Ida093c6792bed45d5f65e3ea0e567eb30de74807
2021-10-04 08:07:21 +00:00
Remi NGUYEN VAN
d7331e929f
Remove "when" usage in ConnectivityServiceTest
...
"when" is not thread-safe, as it relies on global state to find which
mock was called with the method to mock in its parameters.
This causes flakes where non-test code that interacts with the mock may
be called from another thread between the contents of "when" and the
"when" method another thread, causing UnfinishedStubbingExceptions or
other test errors. In particular
ConnectivityService#getNetworkCapabilitiesInternal was seen to be
wrongly identified as a mocking site for Dependencies.
Replace all usages with doReturn().when(mock).method() syntax, which has
better thread safety since global state is not necessary to tie the
mock, mocked method and return value.
Bug: 195626111
Test: atest ConnectivityServiceTest
Change-Id: I57c5ffb3b3f799fc59c3af4ccb323fb5d6794fad
2021-10-04 17:03:44 +09:00
Aaron Huang
d1ed1cb8b7
Merge "Enable/disable FrameworksNetTests"
2021-10-04 07:53:09 +00:00
TreeHugger Robot
053b2f27d1
Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev am: e93efb6f96 am: 0a2d680a4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15618365
Change-Id: Ic5f8107f9c64ed92cd1f76c001a042e8aba36074
2021-10-01 14:32:31 +00:00
TreeHugger Robot
0a2d680a4d
Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev am: e93efb6f96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15618365
Change-Id: I80aa5da33f8c4c5154a721ceec58852b6c2d42f1
2021-10-01 14:21:16 +00:00
TreeHugger Robot
e93efb6f96
Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev
2021-10-01 14:08:56 +00:00
Aaron Huang
1ed8affa72
Enable/disable FrameworksNetTests
...
Currently, there are some test for classes that are not in
connectivity module. If the platform code has a new change
that the test depends on it, then the test cannot verify the
behavior since the change does not exist in module branch.
This change moves the test for non-module classes out of
FrameworksNetTestsLib so that it doesn't go into coverage tests.
Then add those tests to FrameworksNetTests and use a variable
to enable/disable FrameworksNetTests which could minimize merge
conflicts.
Bug: 201265286
Test: make FrameworksNetTests
Change-Id: Ia9669da2c4d79054710e7f4173bc960e3f77f45a
2021-10-01 19:29:50 +08:00
Chiachang Wang
674aeb2780
Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2 am: 3685f8334a am: 1adf3d8224
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114
Change-Id: Ic1b64df21cba8049df90c7c988f677a1a587e159
2021-10-01 01:29:20 +00:00
Chiachang Wang
7b0cf8fa83
Merge "Remove reference when active listener is unregistered" am: a39b107812 am: e129460c46 am: ff64eaee16 am: 1e2e466998
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145
Change-Id: I336ab4181fd9964094b189151e8458a58acedc27
2021-10-01 01:29:12 +00:00
Chiachang Wang
3685f8334a
Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114
Change-Id: Id7ff1f589915f3dadd1dd6b66876a0a4daa90a68
2021-10-01 01:09:56 +00:00
Chiachang Wang
ff64eaee16
Merge "Remove reference when active listener is unregistered" am: a39b107812 am: e129460c46
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145
Change-Id: Iefe5025f40f2ed9f1fc4b5b75e3dc0b9e599f6b5
2021-10-01 01:09:52 +00:00
Chiachang Wang
d2bd93f2e2
Merge "Restore private dns host name after testing" am: 0ee7406d33
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114
Change-Id: I51344c514278433e66016a812e1458e5e2df0e8d
2021-10-01 00:54:23 +00:00
Chiachang Wang
e129460c46
Merge "Remove reference when active listener is unregistered" am: a39b107812
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145
Change-Id: I7b05b33c2a0c02c298d42ab4891ce543fe5ab9bd
2021-10-01 00:54:16 +00:00
Chiachang Wang
0ee7406d33
Merge "Restore private dns host name after testing"
2021-10-01 00:37:15 +00:00
Chiachang Wang
a39b107812
Merge "Remove reference when active listener is unregistered"
2021-10-01 00:37:00 +00:00
Mark Chien
869e3a4e38
Merge "Support set test network to tethering upstream" am: 473d864d20 am: da862b2a35 am: 97f9de1efd am: 3e1e57285a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991
Change-Id: I723387761bff7539885bc192f4fd300d400fd5f9
2021-09-30 13:30:45 +00:00
Mark Chien
97f9de1efd
Merge "Support set test network to tethering upstream" am: 473d864d20 am: da862b2a35
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991
Change-Id: I90a61dfbd9809ab25f182bddf2a9c2bd116a401a
2021-09-30 13:00:58 +00:00
Chiachang Wang
049031ee7d
Merge "Add test for CM#[add|remove]DefaultNetworkActiveListener" am: 2086865010 am: c345dec57b am: 022795b778 am: 43fece15b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827918
Change-Id: I3152dc7aa45e9bb02876d049c8f812cb6aa9d519
2021-09-30 12:54:34 +00:00
Mark Chien
da862b2a35
Merge "Support set test network to tethering upstream" am: 473d864d20
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991
Change-Id: Ifd5c76a943886dfe55e9b68eeb77931dae6fe204
2021-09-30 12:48:15 +00:00
Mark Chien
473d864d20
Merge "Support set test network to tethering upstream"
2021-09-30 12:36:11 +00:00
Chiachang Wang
022795b778
Merge "Add test for CM#[add|remove]DefaultNetworkActiveListener" am: 2086865010 am: c345dec57b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827918
Change-Id: Iddd8043dc128b53e2d2c0533aea954f0a7ac43bb
2021-09-30 12:29:39 +00:00
Chiachang Wang
c345dec57b
Merge "Add test for CM#[add|remove]DefaultNetworkActiveListener" am: 2086865010
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827918
Change-Id: I2b1e5ed720d2ca97f740713ed3b24a119edc8f28
2021-09-30 12:16:40 +00:00
Chiachang Wang
5e54074e6e
Restore private dns host name after testing
...
The helper method in CtsNetUtils will not restore the private
dns hostname back if the device private dns mode is not strict
mode. It does not cause function break since the host
configuration is useful only when the private dns mode is in
strict mode. But tests should restore the setting back to its
old state to prevent break other tests or erase setttings.
Test: atest android.net.cts.ConnectivityManagerTest and
check if the private dns server configuration is
changed or not after testing
Change-Id: I7c85ddac7306c7c3eeac84679d96c4cfb11bd875
2021-09-30 10:32:04 +00:00
Chiachang Wang
2de41686e7
Remove reference when active listener is unregistered
...
The registered listeners are added into internal ArrayMap as a
reference but are not removed when the listeners are
unregistered. The actions for registration should be done in
pairs.
Test: atest FrameworksNetTests
Change-Id: Id9e674f5104d1471dd81224b6a271a8a92172e34
2021-09-30 10:30:35 +00:00
Chiachang Wang
859218c893
Add test for CM#[add|remove]DefaultNetworkActiveListener
...
Bug: 199753782
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I2520f7f5feef61502479767aa023e281d1335ee4
2021-09-30 18:29:29 +08:00
markchien
2fbd3e72d3
Support set test network to tethering upstream
...
Test: atest EthernetTetheringTest
Change-Id: Ief2a92bc6c573a6bb75c72b7a0630e5c0accfa73
2021-09-30 10:14:58 +00:00
Luke Huang
38f82199ab
Merge "Modify Nsd{Service,Manager}Test to conform to its change"
2021-09-29 03:35:20 +00:00