diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-12-01 11:58:31 +0000 |
|---|---|---|
| committer | Mohannad Farrag <aymanm@google.com> | 2024-01-09 12:08:54 +0000 |
| commit | 60189f81ed67beacff074e953eeaa97ca6487476 (patch) | |
| tree | 87271b9dfc594e4e6310c11e36923f5a64b17acc /components/cronet/android/test | |
| parent | 281aa9db6dbb79acfb097b52c87075b16dd0176d (diff) | |
| download | cronet-60189f81ed67beacff074e953eeaa97ca6487476.tar.gz | |
Fix incorrectly resolved merge conflict
* 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
Diffstat (limited to 'components/cronet/android/test')
3 files changed, 0 insertions, 7 deletions
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java index c5bd4da3a..81b88c03b 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java @@ -91,7 +91,6 @@ public class BrotliTest { @Test @SmallTest - @OnlyRunNativeCronet @Ignore // TODO(danstahr): Add test server support for setting the Brotli header public void testBrotliDecoded() throws Exception { mTestRule diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java index 8cd3ffc77..a5b3968c7 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetStressTest.java @@ -12,7 +12,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import org.chromium.base.test.util.Batch; -import org.chromium.net.CronetTestRule.OnlyRunNativeCronet; import org.chromium.net.apihelpers.UploadDataProviders; import org.junit.After; import org.junit.Before; diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java index 36928ec65..efb582636 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java @@ -1291,7 +1291,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @OnlyRunNativeCronet @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky") // Tests that if CronetEngine is shut down on the network thread, an appropriate exception // is thrown. @@ -1350,7 +1349,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @OnlyRunNativeCronet @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky") // Tests that if CronetEngine is shut down when reading from disk cache, // there isn't a crash. See crbug.com/486120. @@ -1736,7 +1734,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @OnlyRunNativeCronet @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky") public void testNoConcurrentDiskUsage() throws Exception { CronetEngine cronetEngine = @@ -2040,7 +2037,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @Ignore("b/298380508") public void testSetLibraryLoaderIsEnforcedByDefaultEmbeddedProvider() throws Exception { CronetEngine.Builder builder = new CronetEngine.Builder(mTestRule.getTestFramework().getContext()); @@ -2061,7 +2057,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @Ignore("b/298380508") public void testSetLibraryLoaderIsIgnoredInNativeCronetEngineBuilderImpl() throws Exception { CronetEngine.Builder builder = new CronetEngine.Builder( |