Merge lp:~mandel/ubuntu-sso-client/fix-proxy-q into lp:ubuntu-sso-client
Proposed by
Manuel de la Peña
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 1005 | ||||
Merged at revision: | 1004 | ||||
Proposed branch: | lp:~mandel/ubuntu-sso-client/fix-proxy-q | ||||
Merge into: | lp:ubuntu-sso-client | ||||
Diff against target: |
70 lines (+13/-3) 2 files modified
ubuntu_sso/utils/webclient/qtnetwork.py (+9/-3) ubuntu_sso/utils/webclient/tests/test_qtnetwork.py (+4/-0) |
||||
To merge this branch: | bzr merge lp:~mandel/ubuntu-sso-client/fix-proxy-q | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Diego Sarmentero (community) | Approve | ||
dobey (community) | Approve | ||
Review via email: mp+127995@code.launchpad.net |
Commit message
- Set both application and nam proxy to work in all supported Qt versions. (LP: #1061528)
Description of the change
- Do not just set the application network but also set it in the nam to be sure we work in all versions (LP:#1061528).
To post a comment you must log in.
I'm getting this:
[FAIL] gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/qt/ tests/test_ reset_password. py", line 106, in test_show_ hide_event SIGNAL( "focusChanged( QWidget* , QWidget*)")), 1) python2. 7/dist- packages/ twisted/ trial/unittest. py", line 271, in assertEqual trial.unittest. FailTest: not equal:
Traceback (most recent call last):
File "/media/
QtCore.
File "/usr/lib/
% (msg, pformat(first), pformat(second)))
twisted.
a = 2
b = 1
ubuntu_ sso.qt. tests.test_ reset_password. ResetPasswordTe stCase. test_show_ hide_event ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == python2. 7/dist- packages/ twisted/ internet/ defer.py" , line 1045, in _inlineCallbacks gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ tests/test_ webclient. py", line 570, in test_anonymous_ proxy_is_ used wc.force_ use_proxy( settings) gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ qtnetwork. py", line 257, in force_use_proxy _set_proxy( proxy) gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ qtnetwork. py", line 111, in _set_proxy nam.setProxy( proxy) TypeError: QNetworkAccessM anager. setProxy( QNetworkProxy) : first argument of unbound method must have type 'QNetworkAccess Manager'
=======
[ERROR]
Traceback (most recent call last):
File "/usr/lib/
result = g.send(result)
File "/media/
self.
File "/media/
self.
File "/media/
self.
exceptions.
ubuntu_ sso.utils. webclient. tests.test_ webclient. BasicProxyTestC ase.test_ anonymous_ proxy_is_ used ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == python2. 7/dist- packages/ twisted/ internet/ defer.py" , line 1045, in _inlineCallbacks gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ tests/test_ webclient. py", line 618, in test_auth_ proxy_is_ requested_ creds_bad_ details wc.force_ use_proxy( wrong_settings) gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ qtnetwork. py", line 257, in force_use_proxy _set_proxy( proxy) gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ qtnetwork. py", line 111, in _set_proxy nam.setProxy( proxy) TypeError: QNetworkAccessM anager. setProxy( QNetworkProxy) : first argument of unbound method must have type 'QNetworkAccess Manager'
=======
[ERROR]
Traceback (most recent call last):
File "/usr/lib/
result = g.send(result)
File "/media/
self.
File "/media/
self.
File "/media/
self.
exceptions.
ubuntu_ sso.utils. webclient. tests.test_ webclient. BasicProxyTestC ase.test_ auth_proxy_ is_requested_ creds_bad_ details ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= == python2. 7/dist- packages/ twisted/ internet/ defer.py" , line 1045, in _inlineCallbacks gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ tests/test_ webclient. py", line 666, in test_auth_ proxy_is_ requested_ creds_bad_ details_ everywhere wc.force_ use_proxy( wrong_settings) gatox/gato/ proyectos/ canonical/ fix-proxy- q/ubuntu_ sso/utils/ webclient/ qtnetwork. py", line 257, in force_use_proxy _set_proxy( proxy)
=======
[ERROR]
Traceback (most recent call last):
File "/usr/lib/
result = g.send(result)
File "/media/
self.
File "/media/
self.
File "/...