Ubuntu One Control Panel

Merge lp:~dobey/ubuntuone-control-panel/fix-ts-test into lp:ubuntuone-control-panel

  1. fix-ts-test
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Roberto Alsina
Approved revision: 408
Merged at revision: 408
Proposed branch: lp:~dobey/ubuntuone-control-panel/fix-ts-test
Merge into: lp:ubuntuone-control-panel
Diff against target: 12 lines (+2/-1)
1 file modified
ubuntuone/controlpanel/tests/test_web_client.py (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-control-panel/fix-ts-test
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+186359@code.launchpad.net

Commit message

Include the scheme and host in the timestamp test, as new oauthlib bails on signing if the values are not included in the URI.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
2--- ubuntuone/controlpanel/tests/test_web_client.py 2013-05-31 16:49:34 +0000
3+++ ubuntuone/controlpanel/tests/test_web_client.py 2013-09-18 15:26:25 +0000
4@@ -199,7 +199,8 @@
5 @defer.inlineCallbacks
6 def test_uses_timestamper(self):
7 """Test that the signed url is using the serverrelative timestamp."""
8- signed = yield self.wc.build_signed_iri(u'/blah?foo=bar')
9+ signed = yield self.wc.build_signed_iri(
10+ SAMPLE_TARGET + u'/blah?foo=bar')
11 parsed_signed = urlparse(signed)
12 signed_query = parse_qs(parsed_signed.query)
13

Subscribers

People subscribed via source and target branches

to all changes: