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

[Manuel de la Peña]

- 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).

- 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).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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

[lp:~mandel/ubuntuone-control-panel/fix-broken-tests]

315. By Manuel de la Peña on 2012-04-18

Use the new api.

=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py	2012-03-13 11:26:12 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py	2012-04-18 16:12:51 +0000
@@ -21,7 +21,7 @@
 from twisted.internet import defer
 from twisted.web import resource
 
-from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
+from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
 from ubuntuone.controlpanel.tests import TestCase
 from ubuntuone.controlpanel.web_client import (
@@ -73,10 +73,10 @@
         return self.contents
 
 
-class MockWebServer(BaseMockWebServer):
+class MockWebServer(HTTPWebServer):
     """A mock webserver for the webclient tests."""
 
-    def get_root_resource(self):
+    def __init__(self):
         """Get the root resource with all the children."""
         root = resource.Resource()
         devices_resource = MockResource()
@@ -86,8 +86,7 @@
         unauthorized = resource.ErrorPage(resource.http.UNAUTHORIZED,
                                           "Unauthrorized", "Unauthrorized")
         root.putChild("unauthorized", unauthorized)
-
-        return root
+        super(MockWebServer, self).__init__(root)
 
 
 class WebClientTestCase(TestCase):
@@ -99,6 +98,7 @@
     def setUp(self):
         yield super(WebClientTestCase, self).setUp()
         self.ws = MockWebServer()
+        self.ws.start()
         self.addCleanup(self.ws.stop)
         self.base_iri = self.ws.get_iri()