qtubuntu-sensors

Merge lp:~aacid/qtubuntu-sensors/temporary_open_file into lp:qtubuntu-sensors

  1. temporary_open_file
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 48
Merged at revision: 49
Proposed branch: lp:~aacid/qtubuntu-sensors/temporary_open_file
Merge into: lp:qtubuntu-sensors
Diff against target: 12 lines (+2/-1)
1 file modified
tests/test_sensor_api.cpp (+2/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu-sensors/temporary_open_file
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+202874@code.launchpad.net

Commit message

Q_ASSERT -> EXPECT_EQ

Since sometimes Q_ASSERT can be compiled out and thus the test would fail

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/32/rebuild

review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looking good also on Qt 5.2 with tests enabled:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3845558/+listing-archive-extra

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_sensor_api.cpp'
2--- tests/test_sensor_api.cpp 2014-01-20 09:13:16 +0000
3+++ tests/test_sensor_api.cpp 2014-01-23 14:48:56 +0000
4@@ -54,7 +54,8 @@
5 protected:
6 virtual void SetUp()
7 {
8- Q_ASSERT(data_file.open());
9+ bool openResult = data_file.open();
10+ EXPECT_EQ(openResult, true);
11 setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", qPrintable(data_file.fileName()), 1);
12 setenv("UBUNTU_PLATFORM_API_BACKEND", "libubuntu_application_api_test.so.1", 1);
13

Subscribers

People subscribed via source and target branches