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

Commit f460dd42 authored by Steve Block's avatar Steve Block
Browse files

Fix a bug with the expected result path in DumpRenderTree2 

If we fail to read from any of the possible expected result paths, we should
not record an expected result path.

Change-Id: Ica96b791c14a7755154be4ec9480be4d13f47a19
parent fdffee82

tests/DumpRenderTree2/src/com/android/dumprendertree2/ManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ public class ManagerService extends Service { 
            bytes = FsUtils.readDataFromUrl(FileFilter.getUrl(relativePath));

        }



        mLastExpectedResultPathFetched = relativePath;

        mLastExpectedResultPathFetched = bytes == null ? null : relativePath;

        return bytes;

    }

tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java

+5 −1
Original line number Diff line number Diff line
@@ -539,7 +539,11 @@ public class Summarizer { 
        String textSource = result.getExpectedTextResultPath();

        String imageSource = result.getExpectedImageResultPath();



        if (textSource != null) {

        if (textSource == null) {

            // Show if a text result is missing. We may want to revisit this decision when we add

            // support for image results.

            html.append("<span class=\"source\">Expected textual result missing</span>");

        } else {

            html.append("<span class=\"source\">Expected textual result from: ");

            html.append("<a href=\"" + ForwarderManager.getHostSchemePort(false) + "LayoutTests/" +

                    textSource + "\"");