Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2967 into donut

Browse Source 
* changes:
  Fixed issue where code for extracting scripts was eclipsed by runTest method.
This commit is contained in:
Android (Google) Code Review
2009-06-02 16:42:42 -07:00
parent 1a21de56b9 3dfd0e131e
commit 7322c96cc0
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/DumpRenderTree/assets/run_reliability_tests.py
View File

@@ -110,8 +110,8 @@ def main(options, args):
# Call ReliabilityTestsAutoTest#startReliabilityTests # Call ReliabilityTestsAutoTest#startReliabilityTests
test_cmd = (test_cmd_prefix + " -e class " test_cmd = (test_cmd_prefix + " -e class "
"com.android.dumprendertree.ReliabilityTest#" "com.android.dumprendertree.ReliabilityTest#"
"runTest -e timeout %d %s" % "runReliabilityTest -e timeout %s %s" %
(timeout_ms, test_cmd_postfix)) (str(timeout_ms), test_cmd_postfix))
adb_output = subprocess.Popen(test_cmd, shell=True, adb_output = subprocess.Popen(test_cmd, shell=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
@@ -125,10 +125,6 @@ def main(options, args):
crashed_tests.append(crashed_test) crashed_tests.append(crashed_test)
logging.info("Resuming reliability test runner...") logging.info("Resuming reliability test runner...")
test_cmd = (test_cmd_prefix + " -e class "
"com.android.dumprendertree.ReliabilityTest#"
"runTest -e timeout %d %s" %
(timeout_ms, test_cmd_postfix))
adb_output = subprocess.Popen(test_cmd, shell=True, stdout=subprocess.PIPE, adb_output = subprocess.Popen(test_cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0] stderr=subprocess.PIPE).communicate()[0]

3
tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java
View File

@@ -30,8 +30,7 @@ public class ReliabilityTest extends ActivityInstrumentationTestCase2<Reliabilit
super(PKG_NAME, ReliabilityTestActivity.class); super(PKG_NAME, ReliabilityTestActivity.class);
} }
@Override public void runReliabilityTest() throws Throwable {
protected void runTest() throws Throwable {
ReliabilityTestActivity activity = getActivity(); ReliabilityTestActivity activity = getActivity();
LayoutTestsAutoRunner runner = (LayoutTestsAutoRunner)getInstrumentation(); LayoutTestsAutoRunner runner = (LayoutTestsAutoRunner)getInstrumentation();