StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Default test to AndroidJUnitTest for auto-generated test config." am: ce1fa25d1b

Browse Source 
am: d91129eea9

Change-Id: Ib0e817e8d403ea130516dbc94201fd4a899c327f
This commit is contained in:
Dan Shi
2018-02-26 23:18:57 +00:00
committed by android-build-merger
parent ed98b94326 d91129eea9
commit 6dbd9e3df9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/auto_gen_test_config.py
View File

@@ -70,8 +70,9 @@ def main(argv):
label = module label = module
runner = instrumentation.attributes[ATTRIBUTE_RUNNER].value runner = instrumentation.attributes[ATTRIBUTE_RUNNER].value
package = manifest.attributes[ATTRIBUTE_PACKAGE].value package = manifest.attributes[ATTRIBUTE_PACKAGE].value
test_type = ('AndroidJUnitTest' if runner.endswith('.AndroidJUnitRunner') test_type = ('InstrumentationTest'
else 'InstrumentationTest') if runner.endswith('.InstrumentationTestRunner')
else 'AndroidJUnitTest')
with open(instrumentation_test_config_template) as template: with open(instrumentation_test_config_template) as template:
config = template.read() config = template.read()

2
tools/auto_gen_test_config_test.py
View File

@@ -155,7 +155,7 @@ class AutoGenTestConfigUnittests(unittest.TestCase):
self.assertEqual(config_file.read(), EXPECTED_JUNIT_TEST_CONFIG) self.assertEqual(config_file.read(), EXPECTED_JUNIT_TEST_CONFIG)
def testCreateInstrumentationTestConfig(self): def testCreateInstrumentationTestConfig(self):
"""Test creating test config for AndroidJUnitTest. """Test creating test config for InstrumentationTest.
""" """
with open(self.manifest_file, 'w') as f: with open(self.manifest_file, 'w') as f:
f.write(MANIFEST_INSTRUMENTATION_TEST) f.write(MANIFEST_INSTRUMENTATION_TEST)