unity-scope-click

Merge lp://qastaging/~mterry/unity-scope-click/gmock into lp://qastaging/unity-scope-click

  1. gmock
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: dobey
Approved revision: 505
Merged at revision: 504
Proposed branch: lp://qastaging/~mterry/unity-scope-click/gmock
Merge into: lp://qastaging/unity-scope-click
Diff against target: 410 lines (+50/-56)
9 files modified
CMakeLists.txt (+1/-7)
libclickscope/tests/test_configuration.cpp (+1/-1)
libclickscope/tests/test_departments-db.cpp (+10/-10)
libclickscope/tests/test_departments.cpp (+4/-4)
libclickscope/tests/test_index.cpp (+3/-3)
libclickscope/tests/test_interface.cpp (+8/-8)
libclickscope/tests/test_package.cpp (+6/-6)
libclickscope/tests/test_preview.cpp (+4/-4)
libclickscope/tests/test_reviews.cpp (+13/-13)
To merge this branch: bzr merge lp://qastaging/~mterry/unity-scope-click/gmock
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+312382@code.qastaging.launchpad.net

Commit message

Fix build with new gmock

Description of the change

I'm working on a separate branch and ran into this gmock issue first.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:504
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/128/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1227/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1234
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1017/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/128/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

16:20:12 [ FAILED ] PackageTest.testPackageListFromJsonNodeMany

Not sure why your changes would cause this, but seems this test is now failing everywhere.

review: Needs Fixing
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:504
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/132/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1254/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1261
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1044/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1044/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1044/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1044/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1044/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1044/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/132/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

I don't know this code very well, I'm not the best person to root-cause a failing test; but feel free to take this MP as a base in order to fix the ftbfs.

(The failure seems unrelated to this branch at first blush: a comparison of 1 v 3, not just a sign error.)

Revision history for this message
dobey (dobey) :
review: Needs Fixing
lp://qastaging/~mterry/unity-scope-click/gmock updated
505. By Michael Terry

Fix test

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:505
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/133/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1255
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1262
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1045/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/133/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

Nice, I uploaded your fix and now CI is cool with it.

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: