Merge lp:~nataliabidart/ubuntu-sso-client/no-more-ping into lp:ubuntu-sso-client

[Natalia Bidart]

[dobey (dobey)]

/home/dobey/Projects/canonical/ubuntu-sso-client/no-more-ping/ubuntu_sso/utils/__init__.py:
    39: 'defer' imported but unused
    47: 'compat' imported but unused
    47: 'webclient' imported but unused

/home/dobey/Projects/canonical/ubuntu-sso-client/no-more-ping/ubuntu_sso/utils/tests/test_common.py:
    43: 'EMAIL' imported but unused
    43: 'TOKEN' imported but unused

review: Needs Fixing

Unmerged revisions

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2013-05-08 18:38:36 +0000
+++ ubuntu_sso/utils/__init__.py	2014-08-13 20:13:13 +0000
@@ -166,35 +166,5 @@
     return ssl_cert_location
 
 
[e-mail]
 def ping_url(url, email, credentials):
-    """Ping the 'url' with the 'email' attached to it.
-
-    Sign the request with 'credentials'. The url must not be None.
-
-    """
-    logger.info('Pinging server using url: %r, email: %r.',
-                url, email)
-    assert isinstance(url, compat.text_type), 'Url %r must be unicode' % url
-
-    target_url = url
-    try:
-        target_url = url.format(email=email)
-    except IndexError:  # tuple index out of range
-        target_url = url.format(email)  # format the first substitution
-
-    if target_url == url:
-        logger.debug('Original url (%r) could not be formatted, '
-                     'appending email (%r).', url, email)
-        assert url.endswith('/'), 'Url %r must end with /.' % url
-        target_url = url + email
-
-    wc = webclient.webclient_factory()
-    try:
-        logger.debug('Opening the url %r with webclient.request.', url)
-        response = yield wc.request(target_url, oauth_credentials=credentials)
-        logger.debug('Url %r opened. Response content: %r.',
-                     url, response.content)
-        defer.returnValue(response)
-    finally:
-        wc.shutdown()
+    """Unused -- it was formerly used to let U1 know about new accounts."""

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2013-05-22 20:14:40 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2014-08-13 20:13:13 +0000
@@ -239,85 +239,3 @@
         root = RootResource()
         super(MockWebServer, self).__init__(root)
 
-
-class FakedError(Exception):
-    """A mock, test, sample, and fake exception."""
-
-
-class PingUrlTestCase(TestCase):
-    """Test suite for the URL pinging."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(PingUrlTestCase, self).setUp()
-        self.url = 'http://example.com/'
-        self.wc = FakeWebclient()
-        self.patch(utils.webclient, "webclient_factory",
-                   lambda *args: self.wc)
-
-    @defer.inlineCallbacks
-    def test_ping_url(self):
-        """The url is opened."""
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(args[0], self.url + EMAIL)
-
-    @defer.inlineCallbacks
-    def test_ping_url_result(self):
-        """The result is returned."""
-        result = yield utils.ping_url(url=self.url, email=EMAIL,
-                                      credentials=TOKEN)
-        self.assertEqual(result.content, 'response')
-
-    @defer.inlineCallbacks
-    def test_request_is_signed_with_credentials(self):
-        """The http request to url is signed with the credentials."""
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        _args, kwargs = self.wc.called[0]
-        self.assertEqual(kwargs["oauth_credentials"], TOKEN)
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{email}/something/else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(email=EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_with_query_params(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{email}?something=else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(email=EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_no_email_kwarg(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{0}/yadda/?something=else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_no_format(self):
-        """The email is appended if formatting could not be accomplished."""
-        self.url = 'http://example.com/yadda/'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url + EMAIL
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])