commit 9a50168c85c691205b8e9606ca6db81c7d9ce482
author Dan Shi <dshi@google.com> Fri Dec 22 13:32:48 2017 -0800
committer Dan Shi <dshi@google.com> Fri Dec 22 13:34:50 2017 -0800
tree f258247c97a6c2685e2e6ccfe156ec0119fac413
parent 1d87b803f78309ba7a7e52452620098004b9d628

Test config should use manifest package attribute

Bug: 70981774,69929803
Test: m -j SetupWizardActivityTests
Change-Id: I6d50744504eac71d6ecae5db9b14e6d30eb923fe

tools/auto_gen_test_config_test.py

diff --git a/tools/auto_gen_test_config_test.py b/tools/auto_gen_test_config_test.py
index a438b73..e70eff8 100644
--- a/tools/auto_gen_test_config_test.py
+++ b/tools/auto_gen_test_config_test.py
@@ -31,7 +31,8 @@
 """
 
 MANIFEST_JUNIT_TEST = """<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.android.my.tests.x">
     <instrumentation
         android:name="android.support.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.my.tests" />
@@ -39,7 +40,8 @@
 """
 
 MANIFEST_INSTRUMENTATION_TEST = """<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.android.my.tests.x">
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="com.android.my.tests"
@@ -69,7 +71,7 @@
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="com.android.my.tests" />
+        <option name="package" value="com.android.my.tests.x" />
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
 </configuration>
@@ -97,16 +99,17 @@
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.InstrumentationTest" >
-        <option name="package" value="com.android.my.tests" />
+        <option name="package" value="com.android.my.tests.x" />
         <option name="runner" value="android.test.InstrumentationTestRunner" />
     </test>
 </configuration>
 """
 
-MAKE_ROOT = os.path.dirname(os.path.dirname(__file__))
-EMPTY_TEST_CONFIG = os.path.join(MAKE_ROOT, 'core', 'empty_test_config.xml')
+TOOLS_DIR = os.path.dirname(os.path.dirname(__file__))
+EMPTY_TEST_CONFIG = os.path.join(
+    TOOLS_DIR, '..', 'core', 'empty_test_config.xml')
 INSTRUMENTATION_TEST_CONFIG_TEMPLATE = os.path.join(
-    MAKE_ROOT, 'core', 'instrumentation_test_config_template.xml')
+    TOOLS_DIR, '..', 'core', 'instrumentation_test_config_template.xml')
 
 
 class AutoGenTestConfigUnittests(unittest.TestCase):