Merge lp:~compiz-team/compiz/compiz.0.9.8.disable_failing_tests_due_to_distro_patch into lp:compiz/0.9.8

Proposed by Sam Spilsbury on 2012-10-02
Status: Merged
Approved by: Daniel van Vugt on 2012-10-02
Approved revision: 3406
Merged at revision: 3406
Proposed branch: lp:~compiz-team/compiz/compiz.0.9.8.disable_failing_tests_due_to_distro_patch
Merge into: lp:compiz/0.9.8
Diff against target: 12 lines (+1/-1)
1 file modified
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.0.9.8.disable_failing_tests_due_to_distro_patch
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-10-02 Approve on 2012-10-02
Review via email: mp+127422@code.launchpad.net

This proposal supersedes a proposal from 2012-10-02.

Commit message

Disabble failing tests due to distro patch

Description of the change

As discussed with didrocks, we cannot remove the primary_is_control.patch distro patch for the sake of fixing failing tests, so this just disables those tests from running on the stable branch so that we can get CI green there again.

We cannot merge https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1058577/+merge/127104 for the reason above

To post a comment you must log in.
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
2--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-09-25 03:42:20 +0000
3+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-02 06:35:24 +0000
4@@ -827,7 +827,7 @@
5 {
6 };
7
8-TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
9+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
10 {
11 const std::string settingName (GetParam ().settingName);
12 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));

Subscribers

People subscribed via source and target branches