tests in unit/ and unit_x11/ may be merged
Bug #1273696 reported by
Tim Peeters
This bug affects 2 people
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| ubuntu-ui-toolkit (Ubuntu) |
Fix Released
|
Medium
|
Cris Dywan | ||
Bug Description
The initial reason for moving some of the tests in tests/unit/ to tests/unit_x11/ was that on jenkins we could not execute tests that need x11. Now that bug 1242646 has been fixed, we no longer need this separation and all unit tests can again go in a single unit/ directory.
The advantage is that we don't have to "guess" anymore where a certain test can be found, and we do not need to duplicate files (such as README which is only in unit/ now but also applies to unit_x11/).
Related branches
lp:~tpeeters/ubuntu-ui-toolkit/mergeUnitTests0
- Tim Peeters: Disapprove
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Cris Dywan: Needs Information
- Zsombor Egri: Disapprove
-
Diff: 29 lines (+4/-4)2 files modifiedtests/unit_x11/add_makecheck.pri (+2/-2)
tests/unit_x11/add_qmlmakecheck.pri (+2/-2)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/mergeUnits
- ubuntu-sdk-build-bot: Approve (continuous-integration)
- Tim Peeters: Approve
-
Diff: 630 lines (+130/-105)34 files modified.bzrignore (+47/-10)
tests/checkresults.sh (+10/-9)
tests/tests.pro (+1/-1)
tests/unit/animator/animator.pro (+1/-1)
tests/unit/asyncloader/asyncloader.pro (+1/-1)
tests/unit/bottomedge/bottomedge.pro (+1/-1)
tests/unit/components/components.pro (+0/-2)
tests/unit/components/tst_pagestack_deprecated_toolbar.qml (+1/-1)
tests/unit/deprecated_theme_engine/deprecated_theme_engine.pro (+1/-1)
tests/unit/i18n/i18n.pro (+2/-2)
tests/unit/iconprovider/iconprovider.pro (+1/-1)
tests/unit/inversemousearea/inversemousearea.pro (+1/-1)
tests/unit/layouts/layouts.pro (+1/-1)
tests/unit/mousefilters/mousefilters.pro (+1/-1)
tests/unit/orientation/orientation.pro (+1/-1)
tests/unit/page/page.pro (+1/-1)
tests/unit/qmltemplate/qmltemplate.pro (+0/-2)
tests/unit/qmltest-include-x11.pri (+2/-2)
tests/unit/recreateview/recreateview.pro (+1/-1)
tests/unit/runtest.sh (+12/-12)
tests/unit/serviceproperties/serviceproperties.pro (+1/-1)
tests/unit/statesaver/statesaver.pro (+1/-1)
tests/unit/subtheming/subtheming.pro (+1/-1)
tests/unit/swipearea/swipearea.pro (+1/-1)
tests/unit/test-include-x11.pri (+1/-1)
tests/unit/test/test.pro (+1/-3)
tests/unit/testparser/testparser.pro (+0/-1)
tests/unit/theme/theme.pro (+0/-2)
tests/unit/touchregistry/touchregistry.pro (+1/-1)
tests/unit/ubuntu_shape/ubuntu_shape.pro (+1/-1)
tests/unit/unit.pro (+33/-14)
tests/unit/visual/visual.pro (+2/-4)
tests/unit_x11/unit_x11.pro (+0/-21)
ubuntu-sdk.pro (+1/-1)
| Changed in ubuntu-ui-toolkit: | |
| status: | New → Confirmed |
| importance: | Undecided → Low |
Revision history for this message
| Tim Peeters (tpeeters) wrote | #1 |
| Changed in ubuntu-ui-toolkit: | |
| importance: | Low → Medium |
| Changed in ubuntu-ui-toolkit (Ubuntu): | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| no longer affects: | ubuntu-ui-toolkit |
| description: | updated |
| Changed in ubuntu-ui-toolkit (Ubuntu): | |
| assignee: | nobody → Christian Dywan (kalikiana) |
| status: | Confirmed → In Progress |
| Changed in ubuntu-ui-toolkit (Ubuntu): | |
| status: | In Progress → Fix Committed |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #2 |
| Changed in ubuntu-ui-toolkit (Ubuntu): | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
12:47:22 < timp> kalikiana: do you remember if we still need to separate tests/unit and tests/unit_x11?
12:53:55 < kalikiana> timp: we still have this one "!contains(
12:54:36 < bzoltan> zbenjamin: in the lxc or onthe host?
12:54:46 < zbenjamin> bzoltan: in the container
12:55:09 < kalikiana> timp: you could make a dummy mr and see if they work on arm... I haven't checked in a while