X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/920528cd24c34f4759113639ae7be42f65c498a5..d908997bbf25f5d00f527a86d0c9e0240ef2960d:/tests/test_sanity.py

diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index 941d287..06cefaf 100644
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -3,20 +3,17 @@
 from random import choice
 import time
 
-from twitter import Twitter, NoAuth, OAuth, read_token_file
+from twitter import Twitter, NoAuth, OAuth, read_token_file, TwitterHTTPError
 from twitter.cmdline import CONSUMER_KEY, CONSUMER_SECRET
 
 noauth = NoAuth()
 oauth = OAuth(*read_token_file('tests/oauth_creds')
                + (CONSUMER_KEY, CONSUMER_SECRET))
 
-twitter = Twitter(domain='api.twitter.com',
-                  auth=oauth,
-                  api_version='1')
 twitter11 = Twitter(domain='api.twitter.com',
                     auth=oauth,
                     api_version='1.1')
-twitter_na = Twitter(domain='api.twitter.com', auth=noauth, api_version='1')
+twitter11_na = Twitter(domain='api.twitter.com', auth=noauth, api_version='1.1')
 
 
 AZaz = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -27,9 +24,9 @@ def get_random_str():
 
 def test_API_set_tweet():
     random_tweet = "A random tweet " + get_random_str()
-    twitter.statuses.update(status=random_tweet)
+    twitter11.statuses.update(status=random_tweet)
     time.sleep(2)
-    recent = twitter.statuses.user_timeline()
+    recent = twitter11.statuses.home_timeline()
     assert recent
     assert isinstance(recent.rate_limit_remaining, int)
     assert isinstance(recent.rate_limit_reset, int)
@@ -38,33 +35,27 @@ def test_API_set_tweet():
 
 def test_API_set_unicode_tweet():
     random_tweet = u"A random tweet with unicode üøπ" + get_random_str()
-    twitter.statuses.update(status=random_tweet)
+    twitter11.statuses.update(status=random_tweet)
 
-    recent = twitter.statuses.user_timeline()
+    recent = twitter11.statuses.home_timeline()
     assert recent
     assert random_tweet == recent[0]['text']
 
 
 def test_search():
-    t_search = Twitter(domain='search.twitter.com')
-    results = t_search.search(q='foo')
+    results = twitter11.search.tweets(q='foo')
     assert results
 
 
-def test_get_trends():
-    # This is one method of inserting parameters, using named
-    # underscore params.
-    world_trends = twitter.trends._woeid(_woeid=1)
-    assert world_trends
-
-
-def test_get_trends_2():
-    # This is a nicer variation of the same call as above.
-    world_trends = twitter.trends._(1)
-    assert world_trends
-
-
 def test_get_trends_3():
     # Of course they broke it all again in 1.1...
     assert twitter11.trends.place(_id=1)
 
+def test_TwitterHTTPError_raised_for_invalid_oauth():
+    test_passed = False
+    try:
+        twitter11_na.statuses.mentions_timeline()
+    except TwitterHTTPError:
+        # this is the error we are looking for :)
+        test_passed = True
+    assert test_passed