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

Branch merges

Merged into lp:ubuntu-system-settings at revision 1699

Ken VanDine: Approve on 2016-08-18

system-apps-ci-bot: Approve (continuous-integration) on 2016-08-18

Diff: 1539 lines (+939/-340)

25 files modified

plugins/mouse/TapArea.qml (+1/-0)
plugins/wifi/CMakeLists.txt (+1/-1)
plugins/wifi/OtherNetwork.qml (+0/-1)
plugins/wifi/wifidbushelper.cpp (+13/-7)
plugins/wifi/wifidbushelper.h (+1/-0)
tests/CMakeLists.txt (+1/-1)
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 (+56/-0)
tests/plugins/CMakeLists.txt (+11/-3)
tests/plugins/mouse/tst_mouse.qml (+2/-1)
tests/plugins/wifi/CMakeLists.txt (+23/-0)
tests/plugins/wifi/WifiSource/qmldir (+2/-0)
tests/plugins/wifi/tst_OtherNetwork.qml (+169/-0)
tests/plugins/wifi/tst_wifidbushelper.cpp (+163/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1700. By Jonas G. Drange on 2016-08-19

sync with trunk

1699. By Jonas G. Drange on 2016-08-17

harden mouse test

1698. By Jonas G. Drange on 2016-08-17

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

1697. By Jonas G. Drange on 2016-08-17

make mouse test less flaky

1696. By Jonas G. Drange on 2016-08-17

set xvfb cmd

1695. By Jonas G. Drange on 2016-08-17

fix minor inaccuracies

1694. By Jonas G. Drange on 2016-08-16

revert some changes that were made in error

1693. By Jonas G. Drange on 2016-08-16

add tests as well

1692. By Jonas G. Drange on 2016-08-16

add wifi dbushelper test

1691. By Jonas G. Drange on 2016-08-16

merge prereq