Merge lp://qastaging/~dobey/ubuntuone-control-panel/update-13-10 into lp://qastaging/ubuntuone-control-panel/stable-13-10

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 402
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/update-13-10
Merge into: lp://qastaging/ubuntuone-control-panel/stable-13-10
Diff against target: 56 lines (+9/-8)
3 files modified
setup.py (+2/-7)
ubuntuone/controlpanel/tests/test_backend.py (+1/-1)
ubuntuone/controlpanel/tests/test_web_client.py (+6/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/update-13-10
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+166902@code.qastaging.launchpad.net

Commit message

[Alejandro J. Cura]

    - Force a fake timestamp for the webclient tests (LP:#1186294).

[Rodney Dawes]

    - Fix pep8 warning.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve
402. By Alejandro J. Cura

[Alejandro J. Cura]

    - Force a fake timestamp for the webclient tests (LP:#1186294).

[Rodney Dawes]

    - Fix pep8 warning.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: