← Back to branch summary

~diegosarmentero/ubuntu-sso-client/mac-port

« back to all changes in this revision

Viewing changes to ubuntu_sso/utils/webclient/tests/test_timestamp.py

  • Committer: Tarmac
  • Author(s): Manuel de la Pena
  • Date: 2012-04-18 15:13:50 UTC
  • mfrom: (933.3.23 fix-webclient-tests)
  • Revision ID: tarmac-20120418151350-3tci8shom7r4kia4
- Added the use of the new added webserver that cleans resources correctly (LP: #960436).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu_sso/utils/webclient/tests/test_timestamp.py
32
32
from twisted.trial.unittest import TestCase
33
33
from twisted.web import resource
34
34
 
 
35
from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
36
 
35
37
from ubuntu_sso.utils.webclient import timestamp, webclient_module
36
 
from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
37
38
 
38
39
 
39
40
class FakedError(Exception):
59
60
        return ""
60
61
 
61
62
 
62
 
class MockWebServer(BaseMockWebServer):
 
63
class MockWebServer(HTTPWebServer):
63
64
    """A mock webserver for testing."""
64
65
 
65
 
    def get_root_resource(self):
66
 
        """Get the root resource with all the children."""
67
 
        return RootResource()
 
66
    def __init__(self):
 
67
        """Create a new server."""
 
68
        super(MockWebServer, self).__init__(RootResource())
68
69
 
69
70
 
70
71
class TimestampCheckerTestCase(TestCase):
76
77
    def setUp(self):
77
78
        yield super(TimestampCheckerTestCase, self).setUp()
78
79
        self.ws = MockWebServer()
 
80
        self.ws.start()
79
81
        self.addCleanup(self.ws.stop)
80
82
        self.webclient_class = webclient_module().WebClient
81
83
        self.patch(timestamp.TimestampChecker, "SERVER_IRI", self.ws.get_iri())