Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1188900.1 into lp://qastaging/compiz/0.9.10

  1. compiz.fix_1188900.1
  2. Merge into 0.9.10
Proposed by Sam Spilsbury
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3744
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1188900.1
Merge into: lp://qastaging/compiz/0.9.10
Diff against target: 1383 lines (+808/-157)
5 files modified
plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt (+2/-0)
plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp (+777/-132)
tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp (+6/-25)
tests/xorg-gtest/include/compiz-xorg-gtest.h (+3/-0)
tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+20/-0)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1188900.1
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone Approve
Review via email: mp+170954@code.qastaging.launchpad.net

Commit message

Add more acceptance tests for the decor plugin.

PixmapDecoratedWindowAcceptance.
  UndecoratedWindowExpandToOrigSize

    Test that upon undecoration, the window has exactly the same geometry
    as it did before decoration.

  DISABLED_UndecorateStaticGravityWindow

    Tests that for windows with a static gravity, the window has exactly
    the same geometry as it did before decoration.

    Disabled, as core is currently not moving the window with the static
    gravity back to where it started.

AdjustmentExtents/PixmapDecorationAdjustment.
  AdjustRestoredWindowBorderMovesClient/P

    Test that changing the border extents causes the client window's
    absolute geometry to change.

  DISABLED_AdjustRestoredWindowBorderShrinkClient/P

    Tests that changing the border extents causes the client window's
    absolute geometry to shrink by the amount of border.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinks/P

    Tests that as the border shrinks away, the client expands back to
    its original size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstMaximized/P

    Tests that even if the client is maximized, if the restored border
    shrinks away it demaximizes back to the same position while also
    accounting for any change in the restored window border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstUndecorated/P

    Tests that even when the client is not permitted to be decorated
    because the decoration hint was removed, when it is redecorated
    it will be moved to the correct position taking into account any
    changes in its border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_AdjustRestoredWindowInputNoMoveClient/P

    Tests that adjusting the input extents (as independent from the
    border extents) of the client does not cause the client to move.

    Disabled, as this behavior appears to be broken in core.

Move the "GetImmediateParent" function into the compiz::testing namespace
so that it can be used by other tests.

Description of the change

Add more acceptance tests for the decor plugin.

PixmapDecoratedWindowAcceptance.
  UndecoratedWindowExpandToOrigSize

    Test that upon undecoration, the window has exactly the same geometry
    as it did before decoration.

  DISABLED_UndecorateStaticGravityWindow

    Tests that for windows with a static gravity, the window has exactly
    the same geometry as it did before decoration.

    Disabled, as core is currently not moving the window with the static
    gravity back to where it started.

AdjustmentExtents/PixmapDecorationAdjustment.
  AdjustRestoredWindowBorderMovesClient/P

    Test that changing the border extents causes the client window's
    absolute geometry to change.

  DISABLED_AdjustRestoredWindowBorderShrinkClient/P

    Tests that changing the border extents causes the client window's
    absolute geometry to shrink by the amount of border.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinks/P

    Tests that as the border shrinks away, the client expands back to
    its original size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstMaximized/P

    Tests that even if the client is maximized, if the restored border
    shrinks away it demaximizes back to the same position while also
    accounting for any change in the restored window border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstUndecorated/P

    Tests that even when the client is not permitted to be decorated
    because the decoration hint was removed, when it is redecorated
    it will be moved to the correct position taking into account any
    changes in its border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_AdjustRestoredWindowInputNoMoveClient/P

    Tests that adjusting the input extents (as independent from the
    border extents) of the client does not cause the client to move.

    Disabled, as this behavior appears to be broken in core.

Move the "GetImmediateParent" function into the compiz::testing namespace
so that it can be used by other tests.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3744
http://jenkins.qa.ubuntu.com/job/compiz-ci/208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/249/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/208/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

What are all those "/P"s in the commit message about ?

I think some word is missing in this comment (probably it is 'disabled'):

264 + /* The use of the timeout is currently because some functionality
265 + * is broken which would cause these barrier conditions to never
266 + * eventuate. For now just get to the fail condition */

187 + void DisallowDecorationsOnWindow (Window window);

Maybe ForbidDecorationsOnWindow (Window window); would be better ? You decide.

This comment could be a one-liner (ultraminor):

406 + /* Select for StructureNotify on the parent and wrapper
407 + * windows */

823 - unsigned int width, height, border, depth;
824 + unsigned int width, height, border;

Don't we need depth anymore ? A quick search in the code shows that it was not
really used, although windows should have a depth for advanced animations, no ?

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

On 23/06/2013 7:00 PM, "MC Return" <email address hidden> wrote:
>
> What are all those "/P"s in the commit message about ?

Just a demonstration that each test is parameterized (so its not repeated 4
times)
>
> I think some word is missing in this comment (probably it is 'disabled'):
>
> 264 + /* The use of the timeout is currently because some
 functionality
> 265 + * is broken which would cause these barrier conditions to
 never
> 266 + * eventuate. For now just get to the fail condition */

Thanks.

>
> 187 + void DisallowDecorationsOnWindow (Window window);
>
> Maybe ForbidDecorationsOnWindow (Window window); would be better ? You
decide.

That works too.
>
> This comment could be a one-liner (ultraminor):
>
> 406 + /* Select for StructureNotify on the parent and wrapper
> 407 + * windows */
>
> 823 - unsigned int width, height, border, depth;
> 824 + unsigned int width, height, border;
>
> Don't we need depth anymore ? A quick search in the code shows that it
 was not
> really used, although windows should have a depth for advanced
 animations, no ?

"Depth" as in bit depth . the variable was removed as I replaced
XGetGeometry usage with a wrapper function which doesn't return a value for
that variable as i don't care about it.

>
>
> --
>
https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1188900.1/+merge/170954
> Your team Compiz Maintainers is requested to review the proposed merge of
lp:~compiz-team/compiz/compiz.fix_1188900.1 into lp:compiz.

lp://qastaging/~compiz-team/compiz/compiz.fix_1188900.1 updated
3743. By Sam Spilsbury

Only mark for no further instantiations once we've finished destructing
the plugin

(LP: #1193596). Fixes: https://bugs.launchpad.net/bugs/1193596.

Approved by PS Jenkins bot, Sami Jaktholm, MC Return.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

[----------] Global test environment tear-down
Server terminated successfully (0). Closing log file.
[==========] 25 tests from 5 test cases ran. (9944 ms total)
[ PASSED ] 25 tests.

  YOU HAVE 19 DISABLED TESTS

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
lp://qastaging/~compiz-team/compiz/compiz.fix_1188900.1 updated
3744. By Sam Spilsbury

Add more acceptance tests for the decor plugin.

PixmapDecoratedWindowAcceptance.
  UndecoratedWindowExpandToOrigSize

    Test that upon undecoration, the window has exactly the same geometry
    as it did before decoration.

  DISABLED_UndecorateStaticGravityWindow

    Tests that for windows with a static gravity, the window has exactly
    the same geometry as it did before decoration.

    Disabled, as core is currently not moving the window with the static
    gravity back to where it started.

AdjustmentExtents/PixmapDecorationAdjustment.
  AdjustRestoredWindowBorderMovesClient/P

    Test that changing the border extents causes the client window's
    absolute geometry to change.

  DISABLED_AdjustRestoredWindowBorderShrinkClient/P

    Tests that changing the border extents causes the client window's
    absolute geometry to shrink by the amount of border.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinks/P

    Tests that as the border shrinks away, the client expands back to
    its original size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstMaximized/P

    Tests that even if the client is maximized, if the restored border
    shrinks away it demaximizes back to the same position while also
    accounting for any change in the restored window border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_ClientExpandsAsBorderShrinksWhilstUndecorated/P

    Tests that even when the client is not permitted to be decorated
    because the decoration hint was removed, when it is redecorated
    it will be moved to the correct position taking into account any
    changes in its border size.

    Disabled, as the current behavior is to expand the frame window
    as opposed to shrinking the client (but this will be changed).

  DISABLED_AdjustRestoredWindowInputNoMoveClient/P

    Tests that adjusting the input extents (as independent from the
    border extents) of the client does not cause the client to move.

    Disabled, as this behavior appears to be broken in core.

Move the "GetImmediateParent" function into the compiz::testing namespace
so that it can be used by other tests. Fixes: https://bugs.launchpad.net/bugs/1188900.

Approved by PS Jenkins bot, Andrea Azzarone.

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: