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

Proposed by Sam Spilsbury on 2012-10-02
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.0.9.8.disable_failing_tests_due_to_distro_patch
Merge into: lp:compiz/0.9.9
Diff against target: 22 lines (+5/-1) (has conflicts)
2 files modified
VERSION (+4/-0)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+1/-1)
Text conflict in VERSION
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
Compiz Maintainers 2012-10-02 Pending
Review via email: mp+127421@code.launchpad.net

This proposal has been superseded by a proposal from 2012-10-02.

Commit message

Disable 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.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'VERSION'
--- VERSION 2012-09-28 05:23:46 +0000
+++ VERSION 2012-10-02 06:37:19 +0000
@@ -1,1 +1,5 @@
1<<<<<<< TREE
10.9.920.9.9
3=======
40.9.8.5
5>>>>>>> MERGE-SOURCE
26
=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-09-25 03:42:20 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp 2012-10-02 06:37:19 +0000
@@ -827,7 +827,7 @@
827{827{
828};828};
829829
830TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)830TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, DISABLED_TestWriteIntegratedMediaKey)
831{831{
832 const std::string settingName (GetParam ().settingName);832 const std::string settingName (GetParam ().settingName);
833 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));833 boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));

Subscribers

People subscribed via source and target branches