Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_3_fail into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test
- test_jenkins_3_fail
- Merge into jenkins-test
| Status: | Merged |
|---|---|
| Approved by: | Timo Jyrinki |
| Approved revision: | 1816 |
| Merged at revision: | 1799 |
| Proposed branch: | lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_3_fail |
| Merge into: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test |
| Diff against target: |
117 lines (+13/-11) 7 files modified
tests/unit/tst_argument/tst_argument.cpp (+4/-3) tests/unit/tst_components/tst_clipboard.qml (+1/-0) tests/unit/tst_components/tst_tab.qml (+1/-1) tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp (+4/-4) tests/unit/tst_units/dpr3/tst_units_dpr3.cpp (+1/-1) tests/xvfb.sh (+1/-1) ubuntu-sdk.pro (+1/-1) |
| To merge this branch: | bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_3_fail |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-01-12.
Commit message
fail
Description of the change
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) : Posted in a previous version of this proposal | # |
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal | # |
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:1807
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1807
https:/
Executed test runs:
None: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) : Posted in a previous version of this proposal | # |
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:1808
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:1808
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1809. By Timo Jyrinki
-
break, break, break
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1808
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1808
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1809
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1810. By Timo Jyrinki
-
it just refuses to break
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1809
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1810
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1811. By Timo Jyrinki
-
verify_false
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1810
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1811
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1811
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1812. By Timo Jyrinki
-
bump, fixed a job
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1812
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:1812
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1813. By Timo Jyrinki
-
bump, jenkins updated
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1813
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1813
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1814. By Timo Jyrinki
-
bump, jenkins updated
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1814
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1814
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1814
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1814
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1814
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1815. By Timo Jyrinki
-
bumpfail
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1815
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 1816. By Timo Jyrinki
-
bumpbfail
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1815
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1816
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:1816
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) : | # |
Preview Diff
| 1 | === modified file 'tests/unit/tst_argument/tst_argument.cpp' |
| 2 | --- tests/unit/tst_argument/tst_argument.cpp 2013-05-19 14:24:48 +0000 |
| 3 | +++ tests/unit/tst_argument/tst_argument.cpp 2016-01-13 16:00:49 +0000 |
| 4 | @@ -40,8 +40,8 @@ |
| 5 | values << "value1" << "value2"; |
| 6 | argument.setValues(values); |
| 7 | |
| 8 | - QCOMPARE(argument.at(-2).type(), QVariant::Invalid); |
| 9 | - QCOMPARE(argument.at(0).type(), QVariant::String); |
| 10 | + QCOMPARE(argument.at(-2).type(), QVariant::String); |
| 11 | + QCOMPARE(argument.at(0).type(), QVariant::Invalid); |
| 12 | QCOMPARE(argument.at(1).type(), QVariant::String); |
| 13 | QCOMPARE(argument.at(2).type(), QVariant::Invalid); |
| 14 | |
| 15 | @@ -61,6 +61,7 @@ |
| 16 | argument.setValueNames(valueNames); |
| 17 | |
| 18 | QCOMPARE(argument.syntax(), expectedSyntax); |
| 19 | + verify(false); |
| 20 | } |
| 21 | |
| 22 | void testSyntax_data() { |
| 23 | @@ -72,7 +73,7 @@ |
| 24 | QStringList valueNames; |
| 25 | valueNames << "VALUE1" << "VALUE2"; |
| 26 | |
| 27 | - QTest::newRow("no name, no valueNames, not required") << "" << QStringList() << false << ""; |
| 28 | + QTest::newRow("no name, no valueNames, not required") << "" << QStringList() << true << ""; |
| 29 | QTest::newRow("name, no valueNames, not required") << "argument" << QStringList() << false << "--argument"; |
| 30 | QTest::newRow("no name, 2 valueNames, not required") << "" << valueNames << false << "[VALUE1] [VALUE2]"; |
| 31 | QTest::newRow("name, 2 valueNames, not required") << "argument" << valueNames << false << "--argument=VALUE1 VALUE2"; |
| 32 | |
| 33 | === modified file 'tests/unit/tst_components/tst_clipboard.qml' |
| 34 | --- tests/unit/tst_components/tst_clipboard.qml 2015-03-03 13:20:06 +0000 |
| 35 | +++ tests/unit/tst_components/tst_clipboard.qml 2016-01-13 16:00:49 +0000 |
| 36 | @@ -69,6 +69,7 @@ |
| 37 | compare(Clipboard.data.color, "#ff0000", "Color pushed"); |
| 38 | Clipboard.push(["application/x-color", "green"]); |
| 39 | compare(Clipboard.data.color, standalone.color, "Color pushed"); |
| 40 | + verify(false); |
| 41 | } |
| 42 | |
| 43 | |
| 44 | |
| 45 | === modified file 'tests/unit/tst_components/tst_tab.qml' |
| 46 | --- tests/unit/tst_components/tst_tab.qml 2015-03-03 13:20:06 +0000 |
| 47 | +++ tests/unit/tst_components/tst_tab.qml 2016-01-13 16:00:49 +0000 |
| 48 | @@ -40,7 +40,7 @@ |
| 49 | } |
| 50 | |
| 51 | function test_index() { |
| 52 | - compare(tab.index, -1, "is -1 by default") |
| 53 | + compare(tab.index, -2, "is -2 by default") |
| 54 | } |
| 55 | |
| 56 | Tab { |
| 57 | |
| 58 | === modified file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp' |
| 59 | --- tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp 2013-05-06 16:33:54 +0000 |
| 60 | +++ tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp 2016-01-13 16:00:49 +0000 |
| 61 | @@ -38,16 +38,16 @@ |
| 62 | |
| 63 | void scaledBorderIdentity() { |
| 64 | UCQQuickImageExtension image; |
| 65 | - QString border = "border: 13"; |
| 66 | - QString expected = "border: 13"; |
| 67 | + QString border = "border: 10"; |
| 68 | + QString expected = "border: 11"; |
| 69 | QString result = image.scaledBorder(border, "1"); |
| 70 | QCOMPARE(result, expected); |
| 71 | } |
| 72 | |
| 73 | void scaledBorderHalf() { |
| 74 | UCQQuickImageExtension image; |
| 75 | - QString border = "border: 13"; |
| 76 | - QString expected = "border: 7"; |
| 77 | + QString border = "border: 5"; |
| 78 | + QString expected = "border: 9"; |
| 79 | QString result = image.scaledBorder(border, "0.5"); |
| 80 | QCOMPARE(result, expected); |
| 81 | } |
| 82 | |
| 83 | === modified file 'tests/unit/tst_units/dpr3/tst_units_dpr3.cpp' |
| 84 | --- tests/unit/tst_units/dpr3/tst_units_dpr3.cpp 2015-05-22 18:51:25 +0000 |
| 85 | +++ tests/unit/tst_units/dpr3/tst_units_dpr3.cpp 2016-01-13 16:00:49 +0000 |
| 86 | @@ -27,7 +27,7 @@ |
| 87 | UCUnits units; |
| 88 | |
| 89 | QCOMPARE(units.dp(1.0), 1.0f); |
| 90 | - QCOMPARE(units.dp(1.32), 1.33333f); |
| 91 | + QCOMPARE(units.dp(0.12), 1.53333f); |
| 92 | QCOMPARE(units.dp(1.72), 1.66666f); |
| 93 | QCOMPARE(units.dp(0.23), 0.333333f); |
| 94 | QCOMPARE(units.dp(0.51), 0.666666f); |
| 95 | |
| 96 | === modified file 'tests/xvfb.sh' |
| 97 | --- tests/xvfb.sh 2013-12-19 14:46:25 +0000 |
| 98 | +++ tests/xvfb.sh 2016-01-13 16:00:49 +0000 |
| 99 | @@ -1,7 +1,7 @@ |
| 100 | #!/bin/sh |
| 101 | # |
| 102 | # Copyright 2013 Canonical Ltd. |
| 103 | -# |
| 104 | +# |
| 105 | # This program is free software; you can redistribute it and/or modify |
| 106 | # it under the terms of the GNU Lesser General Public License as published by |
| 107 | # the Free Software Foundation; version 3. |
| 108 | |
| 109 | === modified file 'ubuntu-sdk.pro' |
| 110 | --- ubuntu-sdk.pro 2015-12-11 13:35:10 +0000 |
| 111 | +++ ubuntu-sdk.pro 2016-01-13 16:00:49 +0000 |
| 112 | @@ -1,5 +1,5 @@ |
| 113 | #include( documentation/documentation.pri ) |
| 114 | - |
| 115 | + |
| 116 | BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \ |
| 117 | "BUILD_DIR=\"$$OUT_PWD\"" |
| 118 |
PASSED: Continuous integration, rev:1807 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64/ 9/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/39/console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64/ 9/rebuild
https:/