ubuntu-system-settings

Merge lp://staging/~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml into lp://staging/ubuntu-system-settings

  1. port-eduroamtest-qml
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Superseded
Proposed branch: lp://staging/~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 2524 lines (+1760/-405)
41 files modified
cmake/QmlTest.cmake (+130/-0)
debian/control (+2/-0)
plugins/system-update/CMakeLists.txt (+1/-0)
plugins/wifi/CMakeLists.txt (+1/-1)
plugins/wifi/OtherNetwork.qml (+0/-1)
plugins/wifi/wifidbushelper.cpp (+14/-7)
plugins/wifi/wifidbushelper.h (+1/-0)
tests/CMakeLists.txt (+9/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+0/-197)
tests/autopilot/ubuntu_system_settings/tests/test_wifi.py (+0/-129)
tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt (+26/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp (+103/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h (+92/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp (+76/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h (+57/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp (+42/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h (+32/-0)
tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir (+2/-0)
tests/mocks/plugins/wifi/fakenetworkmanager.cpp (+65/-0)
tests/mocks/plugins/wifi/fakenetworkmanager.h (+60/-0)
tests/plugins/CMakeLists.txt (+24/-1)
tests/plugins/mouse/CMakeLists.txt (+0/-37)
tests/plugins/mouse/tst_mouse.cpp (+0/-22)
tests/plugins/mouse/tst_mouse.qml (+17/-10)
tests/plugins/wifi/CMakeLists.txt (+23/-0)
tests/plugins/wifi/WifiSource/qmldir (+3/-0)
tests/plugins/wifi/tst_OtherNetwork.qml (+167/-0)
tests/plugins/wifi/tst_wifidbushelper.cpp (+163/-0)
tests/utils/CMakeLists.txt (+1/-0)
tests/utils/modules/CMakeLists.txt (+1/-0)
tests/utils/modules/Ubuntu/CMakeLists.txt (+1/-0)
tests/utils/modules/Ubuntu/Test/CMakeLists.txt (+27/-0)
tests/utils/modules/Ubuntu/Test/TouchEventSequenceWrapper.cpp (+47/-0)
tests/utils/modules/Ubuntu/Test/TouchEventSequenceWrapper.h (+42/-0)
tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml (+319/-0)
tests/utils/modules/Ubuntu/Test/plugin.cpp (+54/-0)
tests/utils/modules/Ubuntu/Test/plugin.h (+33/-0)
tests/utils/modules/Ubuntu/Test/qmldir (+3/-0)
tests/utils/modules/Ubuntu/Test/testutil.cpp (+73/-0)
tests/utils/modules/Ubuntu/Test/testutil.h (+48/-0)
To merge this branch: bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml
Reviewer Review Type Date Requested Status
Ubuntu Touch System Settings Pending
Review via email: mp+303080@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated
1694. By Jonas G. Drange

revert some changes that were made in error

1695. By Jonas G. Drange

fix minor inaccuracies

1696. By Jonas G. Drange

set xvfb cmd

1697. By Jonas G. Drange

make mouse test less flaky

1698. By Jonas G. Drange

put clicks in middle of button, and drop qmenumodel import as it is unused

1699. By Jonas G. Drange

harden mouse test

1700. By Jonas G. Drange

sync with trunk

Unmerged revisions

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