Merge lp:~robru/friends/fix-twitter-test into lp:friends

[Robert Bruce Park]

Fix & re-enable failing twitter test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/friends-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-trusty-amd64-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/friends-ci/53/rebuild

review: Approve (continuous-integration)

=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-09-26 18:23:54 +0000
+++ friends/tests/test_twitter.py	2013-11-01 17:32:54 +0000
@@ -83,7 +83,6 @@
         self.assertEqual(self.account.access_token, 'some clever fake data')
         self.assertEqual(self.account.secret_token, 'sssssshhh!')
 
-    @unittest.skip("FIXME: this is totally broken :-(")
     @mock.patch('friends.protocols.twitter.Downloader')
     @mock.patch('oauthlib.oauth1.rfc5849.generate_nonce',
                 lambda: 'once upon a nonce')
@@ -105,7 +104,7 @@
 oauth_signature_method="HMAC-SHA1", \
 oauth_consumer_key="consume", \
 oauth_token="omega", \
-oauth_signature="2MlC4DOqcAdCUmU647izPmxiL%2F0%3D"'''
+oauth_signature="klnMTp3hH%2Fl3b5%2BmPtBlv%2BCulic%3D"'''
 
         self.protocol._rate_limiter = 'limits'
         class fake: