Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1042041 into lp://qastaging/compiz/0.9.8

  1. compiz.fix_1042041
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Approved by: Martin Mrazik
Approved revision: 3397
Merged at revision: 3390
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1042041
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.fix_1041535.1
Diff against target: 110 lines (+54/-9)
2 files modified
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c (+1/-1)
compizconfig/integration/gnome/gsettings/tests/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp (+53/-8)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1042041
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Daniel van Vugt Approve
Review via email: mp+125992@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-24.

Commit message

Actually change string settings to the new value, not the current one
(LP: #1042041)

Description of the change

Actually change string settings to the new value, not the current one. Tests updated (with matcher to actually check what value is being set, not that a value is being set):
CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6 (0 ms)[ OK ]
CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15 (0 ms)[ OK ]

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3394
http://jenkins.qa.ubuntu.com/job/compiz-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/104/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:3395
http://jenkins.qa.ubuntu.com/job/compiz-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/108/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Blocked, waiting for fixes to the prerequisite branch.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks fine (though I think the very long lines limit readability).

Tests pass.

Valgrind is happy too.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/288/console reported an error when processing this lp:~compiz-team/compiz/compiz.fix_1042041 branch.
Not merging it.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:3397
http://jenkins.qa.ubuntu.com/job/compiz-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/120/console

review: Approve (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

I'm not sure why the autolanding failed but it might be related to low disk space. I'm re-approving to see if it happens again.

Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~compiz-team/compiz/compiz.fix_1041535.1 has not yet been merged into lp:compiz.

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