Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dfd0e13 authored by Guang Zhu's avatar Guang Zhu
Browse files

Fixed issue where code for extracting scripts was eclipsed by runTest method.

parent b56736b6

tests/DumpRenderTree/assets/run_reliability_tests.py

+2 −6
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ def main(options, args): 
  # Call ReliabilityTestsAutoTest#startReliabilityTests

  test_cmd = (test_cmd_prefix + " -e class "

              "com.android.dumprendertree.ReliabilityTest#"

              "runTest -e timeout %d %s" %

              (timeout_ms, test_cmd_postfix))

              "runReliabilityTest -e timeout %s %s" %

              (str(timeout_ms), test_cmd_postfix))



  adb_output = subprocess.Popen(test_cmd, shell=True,

                                stdout=subprocess.PIPE,
@@ -125,10 +125,6 @@ def main(options, args): 
    crashed_tests.append(crashed_test)

    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,

                                  stderr=subprocess.PIPE).communicate()[0]

tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTest.java

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ public class ReliabilityTest extends ActivityInstrumentationTestCase2<Reliabilit 
        super(PKG_NAME, ReliabilityTestActivity.class);

    }

    

    @Override

    protected void runTest() throws Throwable {

    public void runReliabilityTest() throws Throwable {

        ReliabilityTestActivity activity = getActivity();

        LayoutTestsAutoRunner runner = (LayoutTestsAutoRunner)getInstrumentation();