commit 239989c1884eb61914ed991ce044e51c094713dc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 31 16:29:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 31 16:29:48 2020 +0000
tree b6f647859c19f70e3834232bb7240be690d42228
parent 79e6c0d0759957d60819d55b1c6dc5d19fce9f28
parent c01a08c3d45c270da92ef78ba60787d29e988650

Merge "Add tests to services/tests/net test mapping" am: 85e73e6099 am: c01a08c3d4

Change-Id: I8c03db23b28eb231f352b578ca3faa33d519aed8

tests/net/TEST_MAPPING

diff --git a/tests/net/TEST_MAPPING b/tests/net/TEST_MAPPING
index a7853b6..005cbe9 100644
--- a/tests/net/TEST_MAPPING
+++ b/tests/net/TEST_MAPPING
@@ -1,7 +1,12 @@
 {
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "FrameworksNetIntegrationTests"
     }
+  ],
+  "postsubmit": [
+    {
+      "name": "FrameworksNetDeflakeTest"
+    }
   ]
 }
\ No newline at end of file

tests/net/deflake/Android.bp

diff --git a/tests/net/deflake/Android.bp b/tests/net/deflake/Android.bp
index 1c48c74..b1b0171 100644
--- a/tests/net/deflake/Android.bp
+++ b/tests/net/deflake/Android.bp
@@ -26,4 +26,5 @@
         "net-host-tests-utils",
     ],
     data: [":FrameworksNetTests"],
-}
\ No newline at end of file
+    test_suites: ["device-tests"],
+}