Compiz

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

  1. compiz.fix_1041535.1
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 3389
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1041535.1
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.tests_1042537.3
Diff against target: 7820 lines (+5045/-1274)
70 files modified
compizconfig/CMakeLists.txt (+1/-0)
compizconfig/gsettings/CMakeLists.txt (+1/-0)
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+0/-1)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+0/-23)
compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c (+23/-0)
compizconfig/gsettings/mocks/CMakeLists.txt (+21/-0)
compizconfig/gsettings/tests/CMakeLists.txt (+19/-10)
compizconfig/gsettings/tests/compizconfig_ccs_gsettings_settings_env_test.cpp (+364/-0)
compizconfig/gsettings/tests/compizconfig_ccs_gsettings_settings_env_test.h (+134/-0)
compizconfig/gsettings/tests/gsettings-mock-schemas-config.h.in (+2/-0)
compizconfig/gsettings/tests/gsettings_settings_test_fixture.h (+29/-0)
compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+25/-430)
compizconfig/gsettings/tests/test_gsettings_tests.h (+57/-14)
compizconfig/integration/gnome/CMakeLists.txt (+4/-0)
compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c (+18/-3)
compizconfig/integration/gnome/gsettings/CMakeLists.txt (+4/-0)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c (+62/-22)
compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt (+31/-0)
compizconfig/integration/gnome/gsettings/tests/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp (+388/-0)
compizconfig/integration/gnome/include/ccs_gnome_integrated_setting.h (+9/-1)
compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h (+1/-0)
compizconfig/integration/gnome/include/ccs_gnome_integration_types.h (+2/-0)
compizconfig/integration/gnome/include/ccs_gnome_integration_types.h~ (+0/-26)
compizconfig/integration/gnome/src/ccs_gnome_integrated_setting.c (+18/-3)
compizconfig/integration/gnome/src/ccs_gnome_integration.c (+13/-10)
compizconfig/integration/gnome/tests/CMakeLists.txt (+47/-0)
compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c (+222/-0)
compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.h (+42/-0)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+813/-0)
compizconfig/libcompizconfig/src/main.c (+2/-2)
compizconfig/libcompizconfig/tests/CMakeLists.txt (+9/-1)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp (+22/-10)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp (+13/-65)
compizconfig/mocks/libcompizconfig/CMakeLists.txt (+40/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_factory_mock.cpp (+70/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_factory_mock.h (+99/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_mock.cpp (+71/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_mock.h (+97/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_storage_mock.cpp (+73/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integrated_setting_storage_mock.h (+119/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integration_mock.cpp (+70/-0)
compizconfig/mocks/libcompizconfig/compizconfig_ccs_integration_mock.h (+129/-0)
compizconfig/tests/CMakeLists.txt (+71/-0)
compizconfig/tests/compizconfig_backend_concept_test.cpp (+381/-0)
compizconfig/tests/compizconfig_backend_concept_test.h (+144/-189)
compizconfig/tests/compizconfig_backend_concept_test_environment_interface.h (+101/-0)
compizconfig/tests/compizconfig_backend_concept_test_internal.h (+146/-0)
compizconfig/tests/compizconfig_ccs_item_in_list_matcher.cpp (+36/-0)
compizconfig/tests/compizconfig_ccs_item_in_list_matcher.h (+8/-13)
compizconfig/tests/compizconfig_ccs_list_equality.cpp (+74/-0)
compizconfig/tests/compizconfig_ccs_list_equality.h (+15/-29)
compizconfig/tests/compizconfig_ccs_list_wrapper.cpp (+109/-0)
compizconfig/tests/compizconfig_ccs_list_wrapper.h (+0/-199)
compizconfig/tests/compizconfig_ccs_setting_value_matcher.cpp (+69/-0)
compizconfig/tests/compizconfig_ccs_setting_value_matcher.h (+64/-0)
compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp (+103/-0)
compizconfig/tests/compizconfig_ccs_setting_value_operators.h (+17/-52)
compizconfig/tests/compizconfig_ccs_settings_test_fixture.h (+106/-0)
compizconfig/tests/compizconfig_ccs_variant_types.h (+40/-0)
compizconfig/tests/compizconfig_test_value_combiners.cpp (+147/-0)
compizconfig/tests/compizconfig_test_value_combiners.h (+17/-82)
gtk/window-decorator/tests/CMakeLists.txt (+3/-1)
gtk/window-decorator/tests/test_gwd_metacity_decorations.cpp (+2/-3)
gtk/window-decorator/tests/test_gwd_settings.cpp (+65/-83)
plugins/wall/CMakeLists.txt (+4/-2)
tests/shared/glib/glib_gsettings_memory_backend_env.h (+45/-0)
tests/shared/glib/glib_gslice_off_env.h (+43/-0)
tests/shared/gtest_shared_autodestroy.h (+20/-0)
tests/shared/gtest_shared_characterwrapper.h (+21/-0)
tests/shared/gtest_unspecified_bool_type_matcher.h (+30/-0)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1041535.1
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Daniel van Vugt Approve
Tim Penhey (community) Approve
Review via email: mp+125991@code.qastaging.launchpad.net

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

Commit message

Check the returned value for NULL as the integration backend may fail. If the integration backend fails, it should fail properly
(LP: #1041535)

Increased test coverage on CCSGSettingsIntegratedSetting and CCSGNOMEIntegration. Added mocks where appropriate, split out the matcher used in the previous branch.

Description of the change

Increased test coverage on CCSGSettingsIntegratedSetting and CCSGNOMEIntegration. Added mocks where appropriate, split out the matcher used in the previous branch and added the following tests:

        Start 238: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/0
238/582 Test #238: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/0 ...................... Passed 0.02 sec
        Start 239: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/1
239/582 Test #239: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/1 ...................... Passed 0.01 sec
        Start 240: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/2
240/582 Test #240: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/2 ...................... Passed 0.01 sec
        Start 241: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/3
241/582 Test #241: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/3 ...................... Passed 0.01 sec
        Start 242: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/4
242/582 Test #242: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/4 ...................... Passed 0.01 sec
        Start 243: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/5
243/582 Test #243: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/5 ...................... Passed 0.01 sec
        Start 244: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/6
244/582 Test #244: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/6 ...................... Passed 0.01 sec
        Start 245: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/7
245/582 Test #245: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/7 ...................... Passed 0.01 sec
        Start 246: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/8
246/582 Test #246: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/8 ...................... Passed 0.01 sec
        Start 247: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/9
247/582 Test #247: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/9 ...................... Passed 0.01 sec
        Start 248: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/10
248/582 Test #248: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/10 ..................... Passed 0.01 sec
        Start 249: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/11
249/582 Test #249: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/11 ..................... Passed 0.01 sec
        Start 250: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/12
250/582 Test #250: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/12 ..................... Passed 0.01 sec
        Start 251: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/13
251/582 Test #251: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/13 ..................... Passed 0.01 sec
        Start 252: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/14
252/582 Test #252: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/14 ..................... Passed 0.01 sec
        Start 253: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/15
253/582 Test #253: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesReturnNull/15 ..................... Passed 0.01 sec
        Start 254: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/0
254/582 Test #254: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/0 .................... Passed 0.01 sec
        Start 255: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/1
255/582 Test #255: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/1 .................... Passed 0.01 sec
        Start 256: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/2
256/582 Test #256: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/2 .................... Passed 0.01 sec
        Start 257: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/3
257/582 Test #257: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/3 .................... Passed 0.01 sec
        Start 258: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/4
258/582 Test #258: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/4 .................... Passed 0.01 sec
        Start 259: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/5
259/582 Test #259: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/5 .................... Passed 0.01 sec
        Start 260: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6
260/582 Test #260: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6 .................... Passed 0.01 sec
        Start 261: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/7
261/582 Test #261: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/7 .................... Passed 0.01 sec
        Start 262: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/8
262/582 Test #262: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/8 .................... Passed 0.01 sec
        Start 263: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/9
263/582 Test #263: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/9 .................... Passed 0.01 sec
        Start 264: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/10
264/582 Test #264: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/10 ................... Passed 0.01 sec
        Start 265: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/11
265/582 Test #265: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/11 ................... Passed 0.01 sec
        Start 266: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/12
266/582 Test #266: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/12 ................... Passed 0.01 sec
        Start 267: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/13
267/582 Test #267: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/13 ................... Passed 0.01 sec
        Start 268: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/14
268/582 Test #268: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/14 ................... Passed 0.01 sec
        Start 269: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15
269/582 Test #269: CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15 ................... Passed 0.01 sec
        Start 270: CCSGNOMEIntegrationTest.TestConstructComposition
270/582 Test #270: CCSGNOMEIntegrationTest.TestConstructComposition ............................................................................................................ Passed 0.01 sec
        Start 271: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionCurrentViewport
271/582 Test #271: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionCurrentViewport ................................................................................ Passed 0.01 sec
        Start 272: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionFullscreenVisualBell
272/582 Test #272: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionFullscreenVisualBell ........................................................................... Passed 0.01 sec
        Start 273: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionClickToFocus
273/582 Test #273: CCSGNOMEIntegrationTestReadIntegrated.TestReadInSpecialOptionClickToFocus ................................................................................... Passed 0.01 sec
        Start 274: CCSGNOMEIntegrationTestWithMocks.TestConstructGNOMEIntegration
274/582 Test #274: CCSGNOMEIntegrationTestWithMocks.TestConstructGNOMEIntegration .............................................................................................. Passed 0.01 sec
        Start 275: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionMoveInitiateButton
275/582 Test #275: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionMoveInitiateButton ................................................ Passed 0.01 sec
        Start 276: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionResizeInitiateButton
276/582 Test #276: CCSGNOMEIntegrationTestWithMocksReadIntegratedMouseButtonModifiers.TestReadInSpecialOptionResizeInitiateButton .............................................. Passed 0.01 sec
        Start 277: CCSGNOMEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers.TestWriteMouseButtonModifier
277/582 Test #277: CCSGNOMEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers.TestWriteMouseButtonModifier ............................................................ Passed 0.01 sec
        Start 278: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteCurrentViewport
278/582 Test #278: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteCurrentViewport ............................................................................................. Passed 0.01 sec
        Start 279: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteFullscreenVisualBell
279/582 Test #279: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteFullscreenVisualBell ........................................................................................ Passed 0.01 sec
        Start 280: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteClickToFocus
280/582 Test #280: CCSGNOMEIntegrationTestWriteIntegrated.TestWriteClickToFocus ................................................................................................

In order to make this work bug 1049169 was mostly fixed too (there are other memleaks so lets leave it open).

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

There's no explicit mention of fixing bug 1041535. Does it?

If so, please claim bug 1041535 and mark it in progress.

review: Needs Information
Revision history for this message
Martin Mrazik (mrazik) wrote : Posted in a previous version of this proposal

This is the jenkins error:
patching file plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
patching file plugins/expo/CMakeLists.txt
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file plugins/expo/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h
patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
patching file plugins/expo/src/client-list-generator.h
patching file plugins/expo/src/viewport-member-window.h
Patch 100_expo_layout.patch does not apply (enforce with -f)
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
make[1]: *** [override_dh_quilt_patch] Error 1
make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave erro

Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Please add a check for NULL inside ccsStringToModifiers so we can declare bug 1041535 fixed.

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

> This is the jenkins error:
> patching file plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
> patching file plugins/expo/CMakeLists.txt
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- rejects in file plugins/expo/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/include/windows-on-
> viewport.h
> patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
> patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
> patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on-
> viewport.cpp
> patching file plugins/expo/src/client-list-generator.h
> patching file plugins/expo/src/viewport-member-window.h
> Patch 100_expo_layout.patch does not apply (enforce with -f)
> dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit
> code 1
> make[1]: *** [override_dh_quilt_patch] Error 1
> make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377'
> make: *** [build] Error 2
> dpkg-buildpackage: error: debian/rules build gave erro

Hmm, this branch doesn't touch the expo plugin, so that error is suprising. However, maybe trunk has broken CI. I'll look into it.

Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Null check added:

1392 === modified file 'compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c'
1393 --- compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c 2012-08-17 07:33:02 +0000
1394 +++ compizconfig/integration/gnome/gconf/src/ccs_gnome_integration_gconf_integrated_setting.c 2012-09-24 03:58:20 +0000
1395 @@ -63,7 +63,8 @@
1396 {
1397 ccsError ("NULL encountered while reading GConf setting");
1398 free (gnomeKeyPath);
1399 - return v;
1400 + free (v);
1401 + return NULL;
1402 }
1403
1404 if (err)
1405 @@ -71,7 +72,8 @@
1406 ccsError ("%s", err->message);
1407 g_error_free (err);
1408 free (gnomeKeyPath);
1409 - return v;
1410 + free (v);
1411 + return NULL;
1412 }
1413
1414 switch (type)
1415 @@ -80,6 +82,8 @@
1416 if (gconfValue->type != GCONF_VALUE_INT)
1417 {
1418 ccsError ("Expected integer value");
1419 + free (v);
1420 + v = NULL;
1421 break;
1422 }
1423
1424 @@ -89,6 +93,8 @@
1425 if (gconfValue->type != GCONF_VALUE_BOOL)
1426 {
1427 ccsError ("Expected boolean value");
1428 + free (v);
1429 + v = NULL;
1430 break;
1431 }
1432
1433 @@ -99,6 +105,8 @@
1434 if (gconfValue->type != GCONF_VALUE_STRING)
1435 {
1436 ccsError ("Expected string value");
1437 + free (v);
1438 + v = NULL;
1439 break;
1440 }
1441
1442 @@ -220,10 +228,17 @@
1443 ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
1444 }
1445
1446 +void
1447 +ccsGConfGNOMEIntegratedSettingInfoFree (CCSGNOMEIntegratedSettingInfo *info)
1448 +{
1449 + ccsGConfIntegratedSettingFree ((CCSIntegratedSetting *) info);
1450 +}
1451 +
1452 const CCSGNOMEIntegratedSettingInfoInterface ccsGConfGNOMEIntegratedSettingInfoInterface =
1453 {
1454 ccsGConfIntegratedSettingGetSpecialOptionType,
1455 - ccsGConfIntegratedSettingGetGNOMEName
1456 + ccsGConfIntegratedSettingGetGNOMEName,
1457 + ccsGConfGNOMEIntegratedSettingInfoFree
1458 };
1459

(Apologies for the noise, most of the changes are just cleaning up tests and getting the integration code under test)

Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

That too:

@@ -132,9 +132,12 @@
     CCSSettingType type = TypeString;
     CCSSettingValue *v = ccsIntegratedSettingReadValue (mouseButtonModifierSetting, type);

- modMask = ccsStringToModifiers (v->value.asString);
+ if (v)
+ {
+ modMask = ccsStringToModifiers (v->value.asString);

- ccsFreeSettingValueWithType (v, type);
+ ccsFreeSettingValueWithType (v, type);
+ }

     return modMask;
 }

Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Okay, checking the full diff it seems like some unrelated changes are there. They've been reverted now.

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

I'm still terrified that we're considering a 7819 line diff right at the end of the cycle.

Could you instead propose a tiny fix for bug 1041535 and let's discuss this one after branching?

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

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

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

> I'm still terrified that we're considering a 7819 line diff right at the end
> of the cycle.
>
> Could you instead propose a tiny fix for bug 1041535 and let's discuss this
> one after branching?

I'd prefer not to - there's no difference in runtime risk betwene a 7.8k diff where 300 lines touch runtime code and are about fixing the bug and a 300 line diff where 300 lines are about fixing the bug and touch runtime code.

The only reason the diff is so large is because the test code itself has been shuffled around. Mostly to get it into separate libraries.

Revision history for this message
Tim Penhey (thumper) wrote :

Well, jenkins says the tests pass, and the changes seem sane enough.

However there are two points around this:
  * Tests without knowing coverage don't give full confidence. All we know is that the considerations that were checked have defined behaviour. Even full test coverage doesn't mean the code actually works.
  * I'd rather have the 300 line change with the tests than without. However with the diff like this, it is hard to see the actual fix. It isn't easy to see where in the 7.8kloc of change where the bits that matter were touched.

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

I can't break it at least. And valgrinding compiz+ccsm reports no new problems.

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

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/compiz-quantal-mbs-al/3/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-al/./build=pbuilder,distribution=quantal,flavor=amd64/3/console
    FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-al/./build=pbuilder,distribution=quantal,flavor=i386/3/console

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

The following tests FAILED:
   1 - CompizConfigPython.test_profile (SEGFAULT)
   2 - CompizConfigPython.test_plugin (SEGFAULT)
   3 - CompizConfigPython.test_setting (SEGFAULT)
   4 - CompizConfigPython.test_backend (SEGFAULT)
-- Processing memory checking output: #########

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

test 1
        Start 1: CompizConfigPython.test_profile

1: Test command: /bin/bash "/home/dan/bzr/compiz/tmp.535.1/tests/util/run_with_ld_library_path.sh" "/home/dan/bzr/compiz/tmp.535.1/build/compizconfig/libcompizconfig/src" "/usr/bin/python" "/home/dan/bzr/compiz/tmp.535.1/compizconfig/compizconfig-python/tests/test_profile.py"
1: Test timeout computed to be: 1500
1: /usr/bin/python /home/dan/bzr/compiz/tmp.535.1/compizconfig/compizconfig-python/tests/test_profile.py
1: compizconfig - Error: Expected string value
  1/583 Test #1: CompizConfigPython.test_profile .............................................................................................................................***Exception: SegFault 0.30 sec
test 2
        Start 2: CompizConfigPython.test_plugin

2: Test command: /bin/bash "/home/dan/bzr/compiz/tmp.535.1/tests/util/run_with_ld_library_path.sh" "/home/dan/bzr/compiz/tmp.535.1/build/compizconfig/libcompizconfig/src" "/usr/bin/python" "/home/dan/bzr/compiz/tmp.535.1/compizconfig/compizconfig-python/tests/test_plugin.py"
2: Test timeout computed to be: 1500
2: /usr/bin/python /home/dan/bzr/compiz/tmp.535.1/compizconfig/compizconfig-python/tests/test_plugin.py
2: compizconfig - Error: Expected string value
  2/583 Test #2: CompizConfigPython.test_plugin ..............................................................................................................................***Exception: SegFault 0.27 sec

....

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

(fails with ExperimentalMemCheck)

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

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

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

Retested. OK now.

Still not reviewed because this proposal is too big.

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

Weird. Now failing again.

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

Still failing. Now with ctest -VV

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

I give up. Starting with a fresh branch it's passing again.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/compiz-quantal-mbs-al/5/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-al/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
    FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-al/./build=pbuilder,distribution=quantal,flavor=i386/5/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

> FAILED: Autolanding.
> More details in the following jenkins job:
> http://s-jenkins:8080/job/compiz-quantal-mbs-al/5/
> Executed test runs:
> FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-
> al/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
> FAILURE: http://s-jenkins:8080/job/compiz-quantal-mbs-
> al/./build=pbuilder,distribution=quantal,flavor=i386/5/console

Please ignore this comment, it was the result of a mis-configured automation script under test. This branch has already been merged into compiz (rev 3389), so this should have no impact beyond this comment. Please let me know if something still needs to be repaired. My apologies for the inconvenience. P

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

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

review: Approve (continuous-integration)

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