Commit 85c496d3 authored by Ed Morley's avatar Ed Morley
Browse files

Bug 816532 - Print logcat for failed robocop tests; r=gbrown

parent b73d3130

testing/mochitest/runtestsremote.py

+11 −8
Original line number Diff line number Diff line
@@ -389,6 +389,14 @@ class MochiRemote(Mochitest): 
            return 1

        return 0



    def printDeviceInfo(self):

        try:

            logcat = self._dm.getLogcat(filterOutRegexps=fennecLogcatFilters)

            print ''.join(logcat)

            print self._dm.getInfo()

        except devicemanager.DMError:

            print "WARNING: Error getting device information"



    def buildRobotiumConfig(self, options, browserEnv):

        deviceRoot = self._dm.getDeviceRoot()

        fHandle = tempfile.NamedTemporaryFile(suffix='.config',
@@ -500,6 +508,7 @@ def main(): 
                result = mochitest.runTests(options)

                if result != 0:

                    print "ERROR: runTests() exited with code %s" % result

                    mochitest.printDeviceInfo()

                # Ensure earlier failures aren't overwritten by success on this run

                if retVal is None or retVal == 0:

                    retVal = result
@@ -541,15 +550,9 @@ def main(): 
                pass

            retVal = 1



    try:

        logcat = dm.getLogcat(filterOutRegexps=fennecLogcatFilters)

        print ''.join(logcat)

        print dm.getInfo()

    except devicemanager.DMError:

        print "WARNING: Error getting device information at end of test"

    mochitest.printDeviceInfo()



    sys.exit(retVal)



if __name__ == "__main__":

    main()