Treehugger Robot
8d59fe2e82
[automerger skipped] Move ConnectivityCoverageTests to general-tests am: bd01bbaa92 am: 04352ea573 -s ours
...
am skip reason: Merged-In I9dbf98eaa28172a172e707091ea75ffdddd4971b with SHA-1 bd01bbaa92 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165005
Change-Id: I92443d43ac18e29e6108e0f4b323ded4669c3371
2021-07-06 03:17:37 +00:00
Remi NGUYEN VAN
1860724941
[automerger skipped] Fix ConnectivityManagerTest initialization on Q am: a6c016a65d am: 0e586ad73a -s ours
...
am skip reason: Merged-In I87488d0f23628a1ef2d7af0242513fcc5401d598 with SHA-1 a6c016a65d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165004
Change-Id: I0c6dc8a94225463a59ccbf24e89c08778b46d20d
2021-07-06 03:17:35 +00:00
Treehugger Robot
762f6dacf0
[automerger skipped] Move test_mainline_modules to AndroidTest.xml am: fb34c5861a am: e32bc089be -s ours
...
am skip reason: Merged-In Ie0aca0c64646825175769cd375bcecf65de4b4c8 with SHA-1 fb34c5861a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165003
Change-Id: Ibdcc7506d26489cd8cded5e578709d93bf3b83dd
2021-07-06 03:17:33 +00:00
Remi NGUYEN VAN
18043a80d9
[automerger skipped] Add ConnectivityCoverageTests to postsubmit am: 1c45a8a623 am: 4f4bf8d05b -s ours
...
am skip reason: Merged-In I9a05d6a300c5f777497e867d0456bc59b06eee80 with SHA-1 1c45a8a623 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165002
Change-Id: I8605e07b700fc945648b92c7136b80485e74a5a7
2021-07-06 03:17:30 +00:00
Remi NGUYEN VAN
d4ae49c8fe
[automerger skipped] Add connectivity coverage tests am: 168b3d19f1 am: a620f9ef6e -s ours
...
am skip reason: Merged-In I5366e1cc9cd6ddb41f24718246381cc2b1cc1383 with SHA-1 168b3d19f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14873769
Change-Id: I0c1acad98083e3ff96b455dd38c559dbbd43a29e
2021-07-06 03:17:28 +00:00
Remi NGUYEN VAN
04aacc7fab
[automerger skipped] Make tests compatible with mockito-extended am: ad8f23fef4 am: ce711c422e -s ours
...
am skip reason: Merged-In I61fa371e8957037075a2617a014647ff062207c6 with SHA-1 ad8f23fef4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165000
Change-Id: I93f636e203ba898fcc771eeebe451aca8c6edf33
2021-07-06 03:17:25 +00:00
Remi NGUYEN VAN
764b348046
[automerger skipped] Fix KeepalivePacketDataUtilTest crash on eng build am: 8f260383f7 am: c97783e308 -s ours
...
am skip reason: Merged-In Ic06a0db7fefb4acf38b66feba9b47e21f9927b1c with SHA-1 8f260383f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164999
Change-Id: I437d5752b711dbdffc0f4c81b95a4132c25b0534
2021-07-06 03:17:23 +00:00
Treehugger Robot
c5f291c902
[automerger skipped] Update connectivity TEST_MAPPING am: 0e2dbf3106 am: d6848cf464 -s ours
...
am skip reason: Merged-In Ibf05ad64b02c563930ba0f01eb91331b295fe505 with SHA-1 0e2dbf3106 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165001
Change-Id: I5507a5acba74a264c296760a48ccd372392a8a03
2021-07-06 03:17:20 +00:00
Remi NGUYEN VAN
3ec915b12e
[automerger skipped] Merge changes from topic "am-cc17cb7d48ea4bd7adc9183dc0c381e3-sc-dev" into sc-dev am: 0f956db686 -s ours am: 231f777b02 -s ours
...
am skip reason: Merged-In Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2 with SHA-1 8ea5ee6d33 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165007
Change-Id: Ib258eed5c800c66e32ca4ddf1341bef851d3f43e
2021-07-06 03:13:18 +00:00
Treehugger Robot
04352ea573
Move ConnectivityCoverageTests to general-tests am: bd01bbaa92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165005
Change-Id: I76cdbf70a8cc38c1e1d59dabce20c1df129fe341
2021-07-06 03:04:23 +00:00
Remi NGUYEN VAN
0e586ad73a
Fix ConnectivityManagerTest initialization on Q am: a6c016a65d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165004
Change-Id: I4c208ed755696483fed3797d25aa3536a8d49ec5
2021-07-06 03:04:21 +00:00
Treehugger Robot
e32bc089be
Move test_mainline_modules to AndroidTest.xml am: fb34c5861a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165003
Change-Id: I8c39006cbe24964a277f7c45eed861836fcaf9b2
2021-07-06 03:04:18 +00:00
Remi NGUYEN VAN
4f4bf8d05b
Add ConnectivityCoverageTests to postsubmit am: 1c45a8a623
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165002
Change-Id: Ic58bad518f0239e3cbfcfaac4e51048a86c5d3cd
2021-07-06 03:04:15 +00:00
Remi NGUYEN VAN
a620f9ef6e
Add connectivity coverage tests am: 168b3d19f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14873769
Change-Id: I27e4004d35491d99f4fe53de5edacaea47954aa7
2021-07-06 03:04:13 +00:00
Remi NGUYEN VAN
ce711c422e
Make tests compatible with mockito-extended am: ad8f23fef4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165000
Change-Id: I8e5ea50c0ff34a069681d878c3f8668d92cfae2b
2021-07-06 03:04:11 +00:00
Remi NGUYEN VAN
c97783e308
Fix KeepalivePacketDataUtilTest crash on eng build am: 8f260383f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164999
Change-Id: I64c9bd2da7cbfd6d6c254287309e0738201c336f
2021-07-06 03:04:09 +00:00
Treehugger Robot
d6848cf464
Update connectivity TEST_MAPPING am: 0e2dbf3106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165001
Change-Id: I92940eaf52326100e3ffafffcb22120f34aae71f
2021-07-06 03:04:06 +00:00
Remi NGUYEN VAN
231f777b02
[automerger skipped] Merge changes from topic "am-cc17cb7d48ea4bd7adc9183dc0c381e3-sc-dev" into sc-dev am: 0f956db686 -s ours
...
am skip reason: Merged-In Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2 with SHA-1 8ea5ee6d33 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165007
Change-Id: I0c0da3b4d3075e2da48ec136c4129379478aa75a
2021-07-06 02:57:52 +00:00
Remi NGUYEN VAN
0f956db686
Merge changes from topic "am-cc17cb7d48ea4bd7adc9183dc0c381e3-sc-dev" into sc-dev
...
* changes:
Apply jarjar rules on coverage tests
Re-skip connectivity unit tests before S
Move ConnectivityCoverageTests to general-tests
Fix ConnectivityManagerTest initialization on Q
Move test_mainline_modules to AndroidTest.xml
Add ConnectivityCoverageTests to postsubmit
Add connectivity coverage tests
Make tests compatible with mockito-extended
Fix KeepalivePacketDataUtilTest crash on eng build
Update connectivity TEST_MAPPING
2021-07-06 02:42:51 +00:00
Junyu Lai
83cc4b3538
Merge "Consider NetworkOffer is unneeded if it cannot satisfy the request" am: b028fc7cf1 am: ce077a3ad0 am: 8b1a98ff38
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731452
Change-Id: Id7ea1cace4e3cb87c60560f5cf4184f3ab164c82
2021-07-05 09:37:18 +00:00
Junyu Lai
8b1a98ff38
Merge "Consider NetworkOffer is unneeded if it cannot satisfy the request" am: b028fc7cf1 am: ce077a3ad0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731452
Change-Id: Iaff7fca5582c454e651e1ca8042d28968a0148c1
2021-07-05 09:27:16 +00:00
Junyu Lai
ce077a3ad0
Merge "Consider NetworkOffer is unneeded if it cannot satisfy the request" am: b028fc7cf1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731452
Change-Id: I9c7bb2e88ad6b6929bf7db3b7433b772c4f5d15a
2021-07-05 09:09:01 +00:00
Junyu Lai
b028fc7cf1
Merge "Consider NetworkOffer is unneeded if it cannot satisfy the request"
2021-07-05 08:57:07 +00:00
Remi NGUYEN VAN
d8528c607e
Merge "Move BitUtils, RingBuffer test to coretests" am: 6be4ebcb0a am: b65aea1772 am: 5f01d1d538
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754897
Change-Id: I8ee423093f763ecb8ca15211f56ae83885c0eab9
2021-07-05 05:47:30 +00:00
Remi NGUYEN VAN
5f01d1d538
Merge "Move BitUtils, RingBuffer test to coretests" am: 6be4ebcb0a am: b65aea1772
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754897
Change-Id: Ic1a8f779daf2d36dd07b1ce0a84392c74e251263
2021-07-05 05:31:16 +00:00
Remi NGUYEN VAN
b65aea1772
Merge "Move BitUtils, RingBuffer test to coretests" am: 6be4ebcb0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754897
Change-Id: Ib30b1f12b17241d66a80130f772d2948e3cee358
2021-07-05 05:18:21 +00:00
Remi NGUYEN VAN
6be4ebcb0a
Merge "Move BitUtils, RingBuffer test to coretests"
2021-07-05 05:05:34 +00:00
Remi NGUYEN VAN
0b3f20a64d
Apply jarjar rules on coverage tests
...
Apply their respective jarjar rules on tethering and general
connectivity tests, then merge both into the coverage tests suite.
This is necessary to ensure that classes covered by tests have names
matching classes used in code.
Also fix IpConnectivityLogTest to use the module utility instead of the
hidden BitUtils, as the test would fail after internal utils are
jarjared.
Bug: 187935317
Test: atest ConnectivityCoverageTests TetheringCoverageTests
Original-Change: https://android-review.googlesource.com/1749680
Merged-In: Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2
Change-Id: Ib95b58dab93f7adebc445b662a6d15db1ce0e7c2
2021-07-05 05:02:05 +00:00
Remi NGUYEN VAN
fda49a5f17
Re-skip connectivity unit tests before S
...
The tests are packaged together with other tests in a common coverage
suite, so need to be individually annotated so that they are skipped
before S.
They do not need to pass on platforms older than S, because such
platforms will not updated with the code that is tested.
This applies a previous change, this time using DevSdkIgnoreRunner,
as SdkSuppress does not work as expected in branches that have a
codename 2 versions above the SDK version, as is the case in AOSP.
Bug: 187935317
Test: atest ConnectivityCoverageTests on R
atest FrameworksNetTests on S
Original-Change: https://android-review.googlesource.com/1749684
Merged-In: I5808d34459a4c19238baf8873afa7cf942828460
Change-Id: I5808d34459a4c19238baf8873afa7cf942828460
2021-07-05 05:01:54 +00:00
Treehugger Robot
bd01bbaa92
Move ConnectivityCoverageTests to general-tests
...
The test suite is not signed with any particular key so
can be in general-tests. This is also required for TEST_MAPPING.
Bug: 187935317
Original-Change: https://android-review.googlesource.com/1749025
Merged-In: I9dbf98eaa28172a172e707091ea75ffdddd4971b
Change-Id: I9dbf98eaa28172a172e707091ea75ffdddd4971b
Test: TH for test mapping
2021-07-05 05:01:42 +00:00
Remi NGUYEN VAN
a6c016a65d
Fix ConnectivityManagerTest initialization on Q
...
The test can't have TetheringManager as an argument to methods or a
field, otherwise the test runner will crash when scanning the class for
tests because TetheringManager did not exist in Q. Although
testFactoryReset is already skipped on Q, the test runner would fail
at initialization time, before starting the run.
Use CtsTetheringUtils instead. This ensures that TetheringManager does
not have method signatures or members that reference classes that do not
exist on Q, so the test runner can scan the class successfully before
starting the run.
Bug: 188851796
Test: atest ConnectivityManagerTest on Q
Original-Change: https://android-review.googlesource.com/1740779
Merged-In: I87488d0f23628a1ef2d7af0242513fcc5401d598
Change-Id: I87488d0f23628a1ef2d7af0242513fcc5401d598
2021-07-05 05:01:28 +00:00
Treehugger Robot
fb34c5861a
Move test_mainline_modules to AndroidTest.xml
...
When an AndroidTest.xml is used, configuration needs to be in the
AndroidTest.xml file, not in the Android.bp.
This currently causes tests not to be run in TEST_MAPPING as they should
be.
Test: TH needs to test
Bug: 187935317
Original-Change: https://android-review.googlesource.com/1748157
Merged-In: Ie0aca0c64646825175769cd375bcecf65de4b4c8
Change-Id: Ie0aca0c64646825175769cd375bcecf65de4b4c8
2021-07-05 05:01:16 +00:00
Remi NGUYEN VAN
1c45a8a623
Add ConnectivityCoverageTests to postsubmit
...
Add the tests to both postsubmit and mainline-postsubmit.
This should allow moving the tests to presubmit in the near future,
after they have been verified to pass in postsubmit.
Bug: 187935317
Test: treehugger needs to test
Original-Change: https://android-review.googlesource.com/1736506
Merged-In: I9a05d6a300c5f777497e867d0456bc59b06eee80
Change-Id: I9a05d6a300c5f777497e867d0456bc59b06eee80
2021-07-05 05:01:02 +00:00
Remi NGUYEN VAN
168b3d19f1
Add connectivity coverage tests
...
The coverage tests will allow measuring code coverage for all
Connectivity+Tethering code.
This is a combination of the current TetheringCoverageTests, and
FrameworksNetTests.
Adding min_sdk_version to the test prevents it from using deprecated
IoUtils utilities. Replace it with the non-deprecated alternative.
Bug: 187935317
Test: atest ConnectivityCoverageTests
Original-Change: https://android-review.googlesource.com/1731232
Merged-In: I5366e1cc9cd6ddb41f24718246381cc2b1cc1383
Change-Id: I5366e1cc9cd6ddb41f24718246381cc2b1cc1383
2021-07-05 05:00:36 +00:00
Automerger Merge Worker
dc92dd5eee
Merge "[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 -s ours am: 9efcdc4948 -s ours" into sc-v2-dev-plus-aosp
2021-07-03 02:28:12 +00:00
Automerger Merge Worker
d25e18d2bd
Merge "[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 am: 675f699927 -s ours" into sc-v2-dev-plus-aosp
2021-07-03 02:28:10 +00:00
TreeHugger Robot
8480d1ed26
[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 -s ours am: 9efcdc4948 -s ours
...
am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191238
Change-Id: Ica0969ad48bc59d9ac87ead357d16badd8631bed
2021-07-03 02:28:04 +00:00
Maciej Żenczykowski
0a3f1441c7
[automerger skipped] ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff -s ours am: df9a5b82ce -s ours
...
am skip reason: Merged-In I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a with SHA-1 c29af79e26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15192718
Change-Id: I442ba9f8bc6abf7c9820c5f9fc2fcec65c1fbd91
2021-07-03 02:27:52 +00:00
TreeHugger Robot
7117ec00ba
[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 am: 675f699927 -s ours
...
am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191238
Change-Id: Ie892a79f66a48be50e21b5a3b09e143f5c38bb3e
2021-07-03 02:27:49 +00:00
Maciej Żenczykowski
ec8adb3089
[automerger skipped] ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff am: 27c370a509 -s ours
...
am skip reason: Merged-In I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a with SHA-1 c29af79e26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15192718
Change-Id: Ifde6fe778792bdf73f2fcdc8c203d1ee384ee998
2021-07-03 02:27:23 +00:00
TreeHugger Robot
675f699927
Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191238
Change-Id: I90f31700dd49b958c3eb33a4d22e90998236d147
2021-07-03 02:15:41 +00:00
Maciej Żenczykowski
27c370a509
ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15192718
Change-Id: I8590f50c99335b5b5549f1c3da3c009b9ec24e32
2021-07-03 02:12:35 +00:00
TreeHugger Robot
9efcdc4948
[automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 -s ours
...
am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191238
Change-Id: I23169713305bb320dda331cfb37c97959c4cfb20
2021-07-03 02:12:25 +00:00
Maciej Żenczykowski
df9a5b82ce
[automerger skipped] ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff -s ours
...
am skip reason: Merged-In I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a with SHA-1 c29af79e26 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15192718
Change-Id: Ia1d90fa18054a072bc1ef7ee1d6ecf2ad12d195b
2021-07-03 02:12:04 +00:00
TreeHugger Robot
f3c6c3e5b4
Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev
2021-07-03 02:01:54 +00:00
Maciej Żenczykowski
f416b8a1ff
ipv4 tethering offload - decrement ttl during forwarding
...
Bug: 192635131
Test: atest, TreeHugger, flashed on phone, forwarded ipv4 traffic
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Original-Change: https://android-review.googlesource.com/1755049
Merged-In: I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a
Change-Id: I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a
2021-07-02 22:08:34 +00:00
Maciej Żenczykowski
0500c9b1a9
Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7 am: f54ce8312b am: 212fa79a4b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049
Change-Id: Ib34a1b900ea90fc7cc166cd34b72058b40f059a7
2021-07-02 21:51:42 +00:00
Maciej Żenczykowski
212fa79a4b
Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7 am: f54ce8312b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049
Change-Id: Idb6f95c96fa7832f4482fb6fc0237bb242ca8794
2021-07-02 21:36:48 +00:00
Maciej Żenczykowski
f54ce8312b
Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049
Change-Id: I5e09f466e574a8a16dc977cf18eb4922c3dbc480
2021-07-02 21:17:43 +00:00
Maciej Żenczykowski
f21f5357e7
Merge "ipv4 tethering offload - decrement ttl during forwarding"
2021-07-02 21:06:41 +00:00