summaryrefslogtreecommitdiff
path: root/components/cronet/android/test
AgeCommit message (Collapse)Author
2024-06-14Import 126.0.6423.0: merge 'upstream-import' into upstream-stagingMotomu Utsumi
Bug: 345656107 Change-Id: Ibe9e712b1f102e56ea611d88559c4866e7ac2a39
2024-06-14Import Cronet version 126.0.6423.0upstream-importCronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: Ib37cbc097e05ce205b4c198b65877e69b7141b02
2024-06-12Cronet Import 125.0.6383.0 Merge 'upstream-import' into upstream-stagingMotomu Utsumi
Bug: 345656106 Change-Id: Iad86e1b204d621f5892e073a10d600d060999bc6
2024-06-12Import Cronet version 125.0.6383.0Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: I29e70962b36e9c964484170d28af449df1f9a18f
2024-06-07Cronet Import 124.0.6367.42 Merge 'upstream-import' into upstream-stagingMotomu Utsumi
Bug: 345656003 Change-Id: I13a0b5d74315448b361cdc8d1dca17457a7b1c7a
2024-06-07Import Cronet version 124.0.6367.42Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: I727d2277512236d7d0db42e102d291b6204b38e5
2024-06-03Import 123.0.6312.40: Merge upstream-import into upstream-stagingMotomu Utsumi
Change-Id: Ifc570035bb3fcddba358bfd1c9dc93646249391f
2024-06-01Import Cronet version 123.0.6312.40Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: Ie1ecf4a8ee6c6263302f0e88e86baa49a8052442
2024-05-30Cronet 122.0.6261.43: Fix merge conflict in NativeTestServer.javaMotomu Utsumi
aosp/3104740 missed to fix the merge conflicts Test: m NetHttpCoverageTests Bug: 342972034 Change-Id: I083b7b35b3f755928a98924c77d685581ea7510e
2024-05-28Merge branch 'upstream-import' into upstream-stagingMotomu Utsumi
Change-Id: I9b8f799b3a8afc5e4cb0150d7cc74017be5feccc
2024-05-28Import Cronet version 122.0.6261.43Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: Ifb7b548cde690e10cc102366bc538e744efa902b
2024-02-27cronet 121_0_6167_71: cherrypick https://crrev.com/c/5318148Chidera Olibie
Bug: b/322154153, b/307234565 Change-Id: I2e128d94163dc2182c9e36e166954b7cde32abdd
2024-02-05Merge remote-tracking branch 'aosp/main' into upstream-stagingChidera Olibie
Bug: b/322154153 Change-Id: I61dbf0bb966e0479d8e7a58294a914a46e5f59e6
2024-01-31Apply crrev/c/5253448 to reduce flakinessMohannad Farrag
Test: atest NetHttpTests Change-Id: I860e2735258bd7015a82608f40ebaf53c616165f
2024-01-26Merge remote-tracking branch 'aosp/upstream-import' into upstream-stagingChidera Olibie
Change-Id: I959864c5b5531aca216b9965bf471e2c7b6e1025
2024-01-25Cherry-pick crrev/c/5233108Mohannad Farrag
* This is not a clean cherry-pick, I simply copied the entire file as solving merge-conflicts is not really necessary, once the CL itself make its way through the import then the divergence will be removed. Test: atest NetHttpTests Change-Id: I0f13c2d71311e82f10c3efcaf2d12385df0932b2
2024-01-24Import Cronet version 121.0.6167.71Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: Ieee3d31a0e9c404daa9a1630919e62b52ce61d1b
2024-01-17Apply crrev/c/5177031Mohannad Farrag
Bug: 304217500 Change-Id: Ib74b816862f4f853b3aeffdb9f1647c11ed3f00f
2024-01-17Revert Tests & Utils to `upstream-import`Mohannad Farrag
* Reverted all of the test utils + test files back to their original form as found in aosp/upstream-import branch at version 121.0.6103.2 * Added @SkipPresubmit tags back again on some tests, this is the only divergence left. It will be removed once aosp/2910846 gets merged then we can change `exclude-annotation` to `exclude-filter` in TEST_MAPPING. Bug: 304217500 Test: atest NetHttpTests Change-Id: Idf8b76078aaf99613fc23ad65f9d0c6410f0d4a1
2024-01-09Remove CronetTestRuleNewMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2687908/comment/46c6fff9_6778590e/ and https://cs.android.com/android/platform/superproject/main/+/main:external/cronet/Android.extras.bp;l=271 This was supposed to be removed when a Cronet version >= 117.0.5911.0 was imported into AOSP which is the case now. Change-Id: Ibea7c9ff370c043b03b09f4523f726232c7bb8a7
2024-01-09Patch crrev/c/5152885Mohannad Farrag
See https://chromium-review.googlesource.com/c/chromium/src/+/5152885 Bug: 311373434 Bug: 314275954 Change-Id: I0a3e8485852cfcdee3e15193625486bf05a2d19c
2024-01-09Use UserAgent.getDefaultMohannad Farrag
This is used for testing and we should probably change this test upstream to use getDefault to avoid future merge conflicts Bug: 314275954 Change-Id: Ic03cf57881df49ef58ea5589d88555a147075f31
2024-01-09Fix incorrectly resolved merge conflictMohannad Farrag
Accidentally removed FileUtils import which is needed to ensure we use the same implementation as chromium. Bug: 314275954 Change-Id: Ib744540871d8ebb1d0010968d6f3e98e65271c56
2024-01-09Fix incorrectly resolved merge conflictMohannad Farrag
* Forgot to remove @RunNativeOnly annotations as they no longer existed. * Removed @Ignore annotations and switched to disabling those tests using AndroidTest.xml as seen here (aosp/2893182), this reduces the merge conflicts and divergence while still achieving the same end-results. Bug: 314275954 Change-Id: Id2aef699e11463b7d1be9ee9432146eaffa43405
2024-01-02Checkout CronetTestRule to match upstream-importMohannad Farrag
CronetTestRule had some downstream changes that caused merge-conflict, I figured out that the downstream changes are not necessarily as we can use the upstream version of CronetTestRule and import JavaCronetEngine whilst disabling Fallback implementation tests as seen in upcoming CLs Bug: 311373434 Change-Id: I341a4af6ee652b634903bbdbb9899101542c0c6c
2024-01-02Add an import removed incorrectly during conflict resolution.Mohannad Farrag
Bug: 314275954 Change-Id: Ib62ad4b0e6a261d9f4b276a69b68e51c69f9e210
2024-01-02Merge branch 'upstream-import' into upstream_staging_final_121_0_6103_2Mohannad Farrag
Change-Id: Ib1d37aa7813d49232adddf67fa3d8284cf37eb4a
2024-01-02Import Cronet version 121.0.6103.2Cronet Mainline Eng
FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: I690becfaba7ad4293eba08b4f9d1aa7f953fce20
2023-08-31Cronet Import: Disable failing tests due to batchingMohannad Farrag
* Those tests are failing downstream because AOSP runs all the tests in a single batch where Cronet is already initialized and loaded so the code-path to loadLibrary is never triggered. Change-Id: I690ef6e52eba3883fb5ba96694fda4e607d9832c
2023-08-31Cronet Import: Fix incorrectly resolved merge conflictsMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java Change-Id: I406192aa02ecc30ff785435756ac05a3a83abe19
2023-08-25Cronet Import: Fix incorrectly resolved merge conflictsMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestRule.java Change-Id: Ie88978e82f2f0df4afb3c59c862a2972f2c476fe
2023-08-25Cronet Import: Fix incorrectly resolved merge conflictsMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java Change-Id: Ib9b59f179eb39fdb5f33ea641eb47aeaedaf6221
2023-08-25Cronet Import: Fix incorrectly resolved merge conflictMohannad Farrag
See line 814 https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java Change-Id: Ic78021f3a03bbf293027d952808b7a7a31db238b
2023-08-25Cronet Import: Fix incorrectly resolved merge conflictsMohannad Farrag
See Line 251 https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java Change-Id: Idbcbd92d2d03bf89f2fc0d058fce9a5e59dfcd81
2023-08-25Cronet Import: Fix stale mock Http2TestServerMohannad Farrag
See https://chromium-review.googlesource.com/c/chromium/src/+/4501229 for the changes Change-Id: I267b575b4686993e8a09d30f8d558af92aa8c23e
2023-08-25Cronet Import: Fix incorrectly resolved merge conflictMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java Change-Id: I1e46e4c6d8aebddd34be08f4aac6a74149245ef3
2023-08-25Cronet Import: Fix incorrectly resolved merge-conflictsMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java#b91 Change-Id: Ifc07652728abf19c56cd88cc6db32aa8a7612175
2023-08-25Cronet Import: Fix incorrectly solved merge conflictsMohannad Farrag
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/quic_test_server.cc#b69 Change-Id: I5e8cebee623ff1cab78701bce84c4f17b492fec0
2023-08-16Merge remote-tracking branch 'aosp/upstream-import' into upstream-stagingMohannad Farrag
Change-Id: I30a6d116e92d8fe14e64553df0ac84c0cd885749
2023-08-14Import Cronet version 117.0.5938.0Cronet Mainline Eng
Project import generated by Copybara. FolderOrigin-RevId: /tmp/copybara-origin/src Change-Id: Ib7683d0ed240e11ed9068152600c8092afba4571
2023-08-08Cherry-pick https://crrev.com/c/4747040Stefano Duo
Original commit message: Flip enable_telemetry to default to true Bug: 284972285 Change-Id: I8694ab3a746c9a8c3b2846ca6f44d44b4538ce10
2023-08-08Cherry-pick https://crrev.com/c/4740135Stefano Duo
Original commit message: Enable telemetry by default for platform Cronet Bug: 84972285 Change-Id: I0b7019f40db9228a3f07f99d497fb5870cad54a4
2023-08-08Cherry-pick https://crrev.com/c/4687421Stefano Duo
Original commit message: Make CronetSources aware of platform Cronet Cronet from the platform is always loaded from the bootclassloader. This makes it possible to directly implement CRONET_SOURCE_PLATFORM upstream, without having to fork the code downstream: all we have to do is check for the classloader of Cronet's implementation (similarly to what we do for Google Play Services Cronet). Test: TH Bug: 284972285 Change-Id: I62c54fee57dde59de686d714557fe757b74646b8
2023-08-08Cherry-pick https://crrev.com/c/4667153Stefano Duo
Original commit message: Revamp the Cronet telemetry manifest flag Before: <meta-data android:name="org.chromium.net.EnableCronetTelemetry" android:value="true" /> After: <service android:name="android.net.http.MetaDataHolder"> <meta-data android:name="net.android.http.EnableTelemetry" android:value="true" /> </service> The rationale is as follows: - The meta-data entries are moved to a "meta-data holder service" as application-level meta-data tends to cause scalability issues with PackageManager queries. - The prefix is changed from "org.chromium.net" to "android.net.http" to make the names look less jarring when using Cronet in AOSP (i.e. HttpEngine). This means the AOSP prefix is also used even when using the Chromium variant of Cronet, but that seems more tolerable. We could also keep using the Chromium prefix in Chromium and adjust it downstream in AOSP, but that would add complexity for little benefit. - The name "Cronet" is removed because that is redundant with the "android.net.http" prefix, and AOSP surfaces are not supposed to use the term "Cronet". This change is safe from a backwards compatibility perspective because no apps use this flag today, except for one (AGSA), which has been adjusted to specify both the old and new meta-data entries so that it will behave correctly regardless of which Cronet version it's using. We take the opportunity to also simplify the test code - we can simply replace the entire meta-data object instead of "patching" it because Cronet owns the entire Bundle. Bug: 284972285 Test: TH Change-Id: Iccdc60b640e49d1b47473bfb8c95e5f0f4cf60aa
2023-07-26[Cronet] Skip presumbitChidera Olibie
This test has been deflaked upstream via crrev/c/4507293 and will be added back to presubmit once this makes it downstream. Bug: b/293141085 Bug: b/292298108 Test: na Change-Id: I72fce3efb8cca2841990fca0e514fceeea0c01f9
2023-07-25[Cronet] Skip flaky tests from presubmitChidera Olibie
Tests that enable disk storage cache are prone to flakiness. If any test that enables disk storage cache does not shut down the cronetEngine due to flake or for some reason, other disk storage tests fail because the storage path is not freed up for the next cronet engine. This has been fixed upstream by making the CronetTestRule manage the engine's lifetimes. See crrev/c/4574363. This cl will be reverted once the fix makes it to downstream and the tests have been deflaked Bug: b/292298108 Bug: b/293141085 Test: atest NetHttpCoverageTests Change-Id: I9715bb8bda1e22f599cc84a1a1b263c81f9e5c9f
2023-07-17Revert "Revert "Merge remote-tracking branch 'origin/upstream-st..."Stefano Duo
Revert submission 2657749-revert-2647150-httpclient-wrapper-GZUDLKEBSH Reason for revert: Reland with fix Reverted changes: /q/submissionid:2657749-revert-2647150-httpclient-wrapper-GZUDLKEBSH Change-Id: I57bcd366d3b44735268172e1923270935d7892fa
2023-07-17Revert "Merge remote-tracking branch 'origin/upstream-staging'"Stefano Duo
Revert submission 2647150-httpclient-wrapper Reason for revert: ndk build break (b/291449552) Reverted changes: /q/submissionid:2647150-httpclient-wrapper Change-Id: Id0b17455a7b58ac303dff1c08c391513f7927075
2023-07-11Fix BrotliTest#testBrotliAdvertisedStefano Duo
For some reason AOSP's Cronet returns "Accept-Encoding" instead of "accept-encoding". Bug: 288886953 Change-Id: Ic22b2be74d4522eda7774d806f597fb0baeb3c27
2023-07-04Cronet's javatest: go back to targeting org.chromium.net APIsStefano Duo
This effectively reverts almost every downstream changes to Cronet's javatests. The remaning changes are related to * Different tests servers being used in AOSP * Integrated mode not existing in AOSP * Java impl not existing in AOSP * Some other minor change Ideally, these will also go away in the future. Bug: 288886953 Test: N/A (requires child CLs to work) Change-Id: Ic4ddb0d2d561b8a269c596d852119535178b2e20
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 13:02:01 +0000