← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ubuntuone-control-panel/quantal-proposed

« back to all changes in this revision

Viewing changes to ubuntuone/controlpanel/tests/test_web_client.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2012-06-20 16:42:13 UTC
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20120620164213-6z7q5pqc0ydjrp19
Tags: upstream-3.99.0
Import upstream version 3.99.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/tests/test_web_client.py
21
21
from twisted.internet import defer
22
22
from twisted.web import resource
23
23
 
24
 
from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
 
24
from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
25
25
 
26
26
from ubuntuone.controlpanel.tests import TestCase
27
27
from ubuntuone.controlpanel.web_client import (
73
73
        return self.contents
74
74
 
75
75
 
76
 
class MockWebServer(BaseMockWebServer):
 
76
class MockWebServer(HTTPWebServer):
77
77
    """A mock webserver for the webclient tests."""
78
78
 
79
 
    def get_root_resource(self):
 
79
    def __init__(self):
80
80
        """Get the root resource with all the children."""
81
81
        root = resource.Resource()
82
82
        devices_resource = MockResource()
86
86
        unauthorized = resource.ErrorPage(resource.http.UNAUTHORIZED,
87
87
                                          "Unauthrorized", "Unauthrorized")
88
88
        root.putChild("unauthorized", unauthorized)
89
 
 
90
 
        return root
 
89
        super(MockWebServer, self).__init__(root)
91
90
 
92
91
 
93
92
class WebClientTestCase(TestCase):
99
98
    def setUp(self):
100
99
        yield super(WebClientTestCase, self).setUp()
101
100
        self.ws = MockWebServer()
 
101
        self.ws.start()
102
102
        self.addCleanup(self.ws.stop)
103
103
        self.base_iri = self.ws.get_iri()
104
104