Fix tests for bitly, urlborg, and digg.

joshthecoder · joshthecoder · commit 5d61603f2bf2 · 2009-08-02T19:13:29.000-05:00
diff --git a/imports.py b/imports.py
@@ -8,6 +8,7 @@
 from urlparse import urlparse
 from random import randint
 import base64
+from getpass import getpass
 
 try:
     import json
diff --git a/services/bitly.py b/services/bitly.py
@@ -12,6 +12,19 @@ def __init__(self, login=None, apikey=None, password=None):
         self.apikey = apikey
         self.password = password
 
+    def _test(self):
+        # prompt for login
+        self.login = raw_input('bitly login: ')
+        
+        # ask if tester wants to provide apikey or password
+        print 'auth with password(P) or apikey(K)?'
+        if raw_input() == 'P':
+            self.password = getpass('bitly password: ')
+        else:
+            self.apikey = raw_input('bitly apikey: ')
+
+        Service._test(self)
+
     def _setup(self):
         parameters = {'version': self.version}
         if self.apikey:
diff --git a/services/digg.py b/services/digg.py
@@ -10,6 +10,10 @@ def __init__(self, appkey=None):
         self.itemid = None
         self.view_count = None
 
+    def _test(self):
+        self.appkey = 'http://gitorious.org/shorty'
+        Service._test(self)
+
     def shrink(self, bigurl):
         if not self.appkey:
             raise ShortyError('Must set an appkey')
diff --git a/services/urlborg.py b/services/urlborg.py
@@ -8,6 +8,11 @@ class Urlborg(Service):
     def __init__(self, apikey=None):
         self.apikey = apikey
 
+    def _test(self):
+        # prompt tester for apikey
+        self.apikey = raw_input('urlborg apikey: ').strip()
+        Service._test(self)
+
     def shrink(self, bigurl):
         if not self.apikey:
             raise ShortyError('Must set an apikey')
diff --git a/shorty.py b/shorty.py
@@ -42,6 +42,7 @@
 from urlparse import urlparse
 from random import randint
 import base64
+from getpass import getpass
 
 try:
     import json
@@ -157,6 +158,11 @@ class Urlborg(Service):
     def __init__(self, apikey=None):
         self.apikey = apikey
 
+    def _test(self):
+        # prompt tester for apikey
+        self.apikey = raw_input('urlborg apikey: ').strip()
+        Service._test(self)
+
     def shrink(self, bigurl):
         if not self.apikey:
             raise ShortyError('Must set an apikey')
@@ -296,6 +302,19 @@ def __init__(self, login=None, apikey=None, password=None):
         self.apikey = apikey
         self.password = password
 
+    def _test(self):
+        # prompt for login
+        self.login = raw_input('bitly login: ')
+        
+        # ask if tester wants to provide apikey or password
+        print 'auth with password(P) or apikey(K)?'
+        if raw_input() == 'P':
+            self.password = getpass('bitly password: ')
+        else:
+            self.apikey = raw_input('bitly apikey: ')
+
+        Service._test(self)
+
     def _setup(self):
         parameters = {'version': self.version}
         if self.apikey:
@@ -411,6 +430,10 @@ def __init__(self, appkey=None):
         self.itemid = None
         self.view_count = None
 
+    def _test(self):
+        self.appkey = 'http://gitorious.org/shorty'
+        Service._test(self)
+
     def shrink(self, bigurl):
         if not self.appkey:
             raise ShortyError('Must set an appkey')
diff --git a/test.py b/test.py
@@ -2,15 +2,27 @@
 # Copyright 2009 Joshua Roesslein
 # See LICENSE
 
+import sys
+
 import shorty
 
 print 'Running shorty tests...'
 
 passes = 0
 fails = 0
 
-for name, service in shorty.services.items():
+# get services to test
+if len(sys.argv) > 1:
+    try:
+        services = dict((name, shorty.services[name]) for name in sys.argv[1:])
+    except KeyError, k:
+        print 'ERROR: %s not valid service' % k
+        exit(1)
+else:
+    services = shorty.services
 
+# run tests
+for name, service in services.items():
     try:
         if service.tested:
             # skip services with aliases
