Merge lp://qastaging/~mikemc/ubuntuone-client/find-proxy-tunnel-fix-1083832 into lp://qastaging/ubuntuone-client
Proposed by
Mike McCracken
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike McCracken | ||||
| Approved revision: | 1359 | ||||
| Merged at revision: | 1362 | ||||
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-client/find-proxy-tunnel-fix-1083832 | ||||
| Merge into: | lp://qastaging/ubuntuone-client | ||||
| Diff against target: |
206 lines (+37/-61) 5 files modified
tests/syncdaemon/test_tunnel_runner.py (+2/-20) ubuntuone/platform/constants.py (+0/-5) ubuntuone/proxy/tunnel_client.py (+7/-1) ubuntuone/syncdaemon/tunnel_runner.py (+6/-28) ubuntuone/syncdaemon/utils.py (+22/-7) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-client/find-proxy-tunnel-fix-1083832 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Curtin (community) | Approve | ||
| Michał Karnicki (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Use dirspec to find proxy tunnel exe, adding support for frozen osx. (LP: #1083832)
Description of the change
- Use dirspec to find proxy tunnel exe, adding support for frozen osx. (LP: #1083832)
Removed tests of old code that checks e.g. getting windows binary when frozen - dirspec tests cover those cases.
Tests pass on linux, and tests relevant to changes here pass on windows and darwin.
Tested IRL on darwin:
- start local squid, set system proxy settings to use it
- frozen app starts proxy-tunnel
- CONNECT to u1 servers shows up in squid access.log
Partially tested IRL on windows:
- starting control panel from source still correctly starts proxy-tunnel.
To post a comment you must log in.
Revision history for this message
| Mike McCracken (mikemc) wrote | # |
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+ print "IN START_PROCESS: tunnel_cmd is %r" % tunnel_cmd # MMCC DEBUG, 11/26 11:37: