Merge lp:~coreygoldberg/window-mocker/wm-fix1278917 into lp:window-mocker
Proposed by
Corey Goldberg
Status: | Merged |
---|---|
Merged at revision: | 26 |
Proposed branch: | lp:~coreygoldberg/window-mocker/wm-fix1278917 |
Merge into: | lp:window-mocker |
Diff against target: |
101 lines (+30/-9) 2 files modified
tests/test_app_functional.py (+26/-7) windowmocker/plugins/qt4.py (+4/-2) |
To merge this branch: | bzr merge lp:~coreygoldberg/window-mocker/wm-fix1278917 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Autopilot Hackers | Pending | ||
Review via email:
|
Commit message
fixed qt4 plugin, previous regression
Description of the change
this branch fixes the window-mocker regression currently in trunk.
in qt4.py, changed use of..
isinstance(item, str)
to:
isinstance(item, six.string_types)
using six, so unicode types are accepted under Python2.
To post a comment you must log in.
PASSED: Continuous integration, rev:26 jenkins. qa.ubuntu. com/job/ window- mocker- ci/25/ jenkins. qa.ubuntu. com/job/ window- mocker- trusty- amd64-ci/ 23 jenkins. qa.ubuntu. com/job/ window- mocker- trusty- armhf-ci/ 23 jenkins. qa.ubuntu. com/job/ window- mocker- trusty- i386-ci/ 23
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/window- mocker- ci/25/rebuild
http://