Backout 8ec01f6f316f (bug 705175), a1dc0efef542 (bug 716077), b5686f25b258 (bug 710445), 32f8d3be2ad1 (bug 715309) for mochitest/reftest failures on Android & Windows

2012-01-07 14:57:58 +00:00
parent 47daecbd14
commit 9ae1414fdd
14 changed files with 216 additions and 202 deletions
--- a/mobile/android/base/tests/BaseTest.java.in
+++ b/mobile/android/base/tests/BaseTest.java.in
@@ -51,16 +51,15 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
        mSolo = new Solo(getInstrumentation());
        mDriver = new FennecNativeDriver(mActivity, mSolo);
        mActions = new FennecNativeActions(mActivity, mSolo, getInstrumentation());
+        mDriver.setLogFile((String)config.get("logfile"));

        mAsserter = new FennecNativeAssert();
        mAsserter.setLogFile((String)config.get("logfile"));
-        mAsserter.setTestName(this.getClass().getName());
    }

    @Override
    public void tearDown() throws Exception {
        try {
-            mAsserter.finalize();
            mSolo.finalize();
        } catch (Throwable e) {
            e.printStackTrace();