commit 85e73e6099f2fc3a1ed64e0d9ddb521ba39cf76c
author Remi NGUYEN VAN <reminv@google.com> Thu Jan 30 06:20:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 06:20:39 2020 +0000
tree db2aefd333dac21463dbda7231443c95294bd968
parent d8a5039db04a4db1a16da8c7c36a80ec716c34bd
parent b19a5597cad320b402fbdfa49a2d8d8a50c9205e

Merge "Add tests to services/tests/net test mapping"

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"],
+}