Merge lp://qastaging/~mandel/ubuntuone-control-panel/fix-broken-tests into lp://qastaging/ubuntuone-control-panel

Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 315
Merged at revision: 314
Proposed branch: lp://qastaging/~mandel/ubuntuone-control-panel/fix-broken-tests
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 42 lines (+5/-5)
1 file modified
ubuntuone/controlpanel/tests/test_web_client.py (+5/-5)
To merge this branch: bzr merge lp://qastaging/~mandel/ubuntuone-control-panel/fix-broken-tests
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+101589@code.qastaging.launchpad.net

Commit message

- Fixed all those broken tests on windows related to the dirty reactor left the mocked webserver by using the new implementation from ubuntuone-dev-tools (LP: #960436).

Description of the change

- Fixed all those broken tests on windows related to the dirty reactor left the mocked webserver by using the new implementation from ubuntuone-dev-tools (LP: #960436).

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~mandel/ubuntuone-control-panel/fix-broken-tests into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/tests/test_web_client.py", line 24, in <module>
    from ubuntuone.devtools.testcases.txwebserver import WebServer
ImportError: No module named txwebserver

315. By Manuel de la Peña

Use the new api.

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: