diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2018-06-01 17:30:27 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2018-06-04 11:24:10 +0000 |
| commit | 2fb270c77f6c7bef6b9f56d49ee8353cca78fdb1 (patch) | |
| tree | 4a6134e2dd4356b2ec75265e715eba18753b63b1 /tests | |
| parent | 149a77a01d96aa0943c950685189719e73313378 (diff) | |
Squish: Update tst_simple_analyze
Change-Id: I2cbe39a225760f53d70487e105e2b45fd4e16d33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index c1578ee55d..8b73e7aa72 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -102,7 +102,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): model = waitForObject(":Events.QmlProfilerEventsTable_QmlProfiler::" "Internal::QmlProfilerStatisticsMainView").model() compareEventsTab(model, "events_qt%s.tsv" % qtVersion) - test.compare(dumpItems(model, column=colPercent)[0], '100.00 %') + test.compare(dumpItems(model, column=colPercent)[0], '100 %') # cannot run following test on colShortest (unstable) for i in [colTotal, colMean, colMedian, colLongest]: for item in dumpItems(model, column=i)[2:5]: @@ -122,8 +122,8 @@ def performTest(workingDir, projectName, targetCount, availableConfigs): test.compare(model.index(row, colMean).data(), model.index(row, col).data(), "For just one call, no differences in execution time may be shown.") elif str(model.index(row, colCalls).data()) == "2": - test.compare(model.index(row, colMedian).data(), model.index(row, colLongest).data(), - "For two calls, median and longest time must be the same.") + test.compare(model.index(row, colMedian).data(), model.index(row, colMean).data(), + "For two calls, median and mean time must be the same.") progressBarWait(15000, False) # wait for "Build" progressbar to disappear clickButton(waitForObject(":Analyzer Toolbar.Clear_QToolButton")) test.verify(waitFor("model.rowCount() == 0", 3000), "Analyzer results cleared.") diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv index 4038c164c9..8f40828cd4 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv +++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv @@ -1,5 +1,5 @@ "0" "1" "6" "11" -"<program>" "" "1" "Main Program" +"<program>" "" "1" "Main program" "main.qml:15" "Handling Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" "main.qml:15" "JavaScript" "2" "onTriggered" "main.qml:4" "Creating" "2" "QtQuick.Window/Window" diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv index cd25a9eb10..a5228fad41 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv +++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.6.1.tsv @@ -1,5 +1,5 @@ "0" "1" "6" "11" -"<program>" "" "1" "Main Program" +"<program>" "" "1" "Main program" "main.qml:15" "Handling Signal" "2" "onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }" "main.qml:15" "JavaScript" "2" "onTriggered" "main.qml:4" "Creating" "2" "QtQuick.Window/Window" |