Added test cases for tasks and clients

Author: jerrymakesjelly

autoremovetorrents/client/base/clientbase.py

@@ -4,7 +4,9 @@
 import time
 from ..torrent import Torrent
 from ..torrentstatus import TorrentStatus
-from ..exception.loginfailed import LoginFailed
+from ..exception.loginfailure import LoginFailure
+from ..exception.deletionfailure import DeletionFailure
+from ..exception.connectionfailure import ConnectionFailure
 
 class qBittorrent(object):
     def __init__(self, host):
@@ -23,15 +25,19 @@ def __init__(self, host):
 
     # Login to qBittorrent
     def login(self, username, password):
-        request = requests.post(self._host+'/login', data={'username':username, 'password':password})
-        self._logger.info(request.text)
+        try:
+            request = requests.post(self._host+'/login', data={'username':username, 'password':password})
+            self._logger.info(request.text)
+        except Exception as exc:
+            raise ConnectionFailure(str(exc))
+        
         if request.status_code == 200:
             if request.text == 'Ok.': # Success
                 self._cookies = request.cookies
             else:
-                raise LoginFailed(request.text)
+                raise LoginFailure(request.text)
         else:
-            raise LoginFailed('The server returned HTTP %d.' % request.status_code)
+            raise LoginFailure('The server returned HTTP %d.' % request.status_code)
 
     # Get qBittorrent Version
     def version(self):

autoremovetorrents/client/base/torrentstatus.py

@@ -3,6 +3,11 @@
 from requests.auth import HTTPBasicAuth
 from ..torrent import Torrent
 from ..torrentstatus import TorrentStatus
+from ..exception.connectionfailure import ConnectionFailure
+from ..exception.deletionfailure import DeletionFailure
+from ..exception.loginfailure import LoginFailure
+from ..exception.nosuchclient import NoSuchClient
+from ..exception.remotefailure import RemoteFailure
 
 class Transmission(object):
     def __init__(self, host):
@@ -28,22 +33,28 @@ def _make_transmission_request(self, method, arguments=None):
         while retry > 0:
             retry -= 1
             # Make request
-            request = requests.post(self._host+'/transmission/rpc',
-                json={'method':method, 'arguments':arguments, 'tag':self._request_id},
-                headers={'X-Transmission-Session-Id': self._session_id},
-                auth=HTTPBasicAuth(self._username, self._password))
-            self._request_id += 1
+            try:
+                request = requests.post(self._host+'/transmission/rpc',
+                    json={'method':method, 'arguments':arguments, 'tag':self._request_id},
+                    headers={'X-Transmission-Session-Id': self._session_id},
+                    auth=HTTPBasicAuth(self._username, self._password))
+                self._request_id += 1
+            except Exception as exc:
+                raise ConnectionFailure(str(exc))
+
             if request.status_code == 409: # Save Session ID and retry
                 self._session_id = request.headers['X-Transmission-Session-Id']
             elif request.status_code == 401: # Unauthorized user
-                raise RuntimeError('Unauthorized user.')
-            else:
+                raise LoginFailure('Unauthorized user.')
+            elif request.status_code == 200:
                 result = request.json()
                 if result['result'] == 'success': # Success
                     return result['arguments']
                 else:
-                    raise RuntimeError(result['result'])
-        raise RuntimeError('HTTP error on requesting '+method)
+                    raise RemoteFailure(result['result'])
+        raise RemoteFailure('The server responsed %d on method %s.' \
+            % (request.status_code, method)
+        )
 
     # Get Transmission Version
     def version(self):
@@ -64,7 +75,7 @@ def torrent_properties(self, torrent_hash):
             'fields': ['hashString', 'name', 'trackers', 'status', 'totalSize', 'uploadRatio', 'uploadedEver', 'addedDate', 'secondsSeeding']}
             )
         if len(result['torrents']) == 0: # No such torrent
-            raise RuntimeError('No such torrent.')
+            raise NoSuchClient("No such torrent of hash '%s'." % torrent_hash)
         torrent = result['torrents'][0]
         # Judge status
         status_list = [
@@ -87,9 +98,9 @@ def torrent_properties(self, torrent_hash):
     # Remove Torrent
     def remove_torrent(self, torrent_hash):
         self._make_transmission_request('torrent-remove',
-            {'ids':[torrent_hash], 'delete-local-data':False})
+                {'ids':[torrent_hash], 'delete-local-data':False})
 
     # Remove Data
     def remove_data(self, torrent_hash):
         self._make_transmission_request('torrent-remove',
-            {'ids':[torrent_hash], 'delete-local-data':True})
+                {'ids':[torrent_hash], 'delete-local-data':True})

autoremovetorrents/client/qbittorrent.py

@@ -5,6 +5,11 @@
 from requests.auth import HTTPBasicAuth
 import requests
 from ..torrent import Torrent
+from autoremovetorrents.exception.connectionfailure import ConnectionFailure
+from autoremovetorrents.exception.deletionfailure import DeletionFailure
+from autoremovetorrents.exception.loginfailure import LoginFailure
+from autoremovetorrents.exception.nosuchtorrent import NoSuchTorrent
+from autoremovetorrents.exception.remotefailure import RemoteFailure
 from ..torrentstatus import TorrentStatus
 
 class uTorrent(object):
@@ -27,13 +32,21 @@ def login(self, username, password):
         # HTTP Authorization
         self._auth = HTTPBasicAuth(username, password)
         # Requests Token
-        request = requests.get(self._host+'/gui/token.html', auth=self._auth)
+        try:
+            request = requests.get(self._host+'/gui/token.html', auth=self._auth)
+        except Exception as exc:
+            raise ConnectionFailure(str(exc))
+        
         pattern = re.compile('<[^>]+>')
         text = request.text
-        if request.status_code != 200: # Error
-            raise RuntimeError(text)
-        self._token = pattern.sub('', text)
-        self._cookies = request.cookies
+        if request.status_code == 200:     
+            self._token = pattern.sub('', text)
+            self._cookies = request.cookies
+        elif request.status_code == 401: # Error
+            raise LoginFailure('401 Unauthorized.')
+        else:
+            raise RemoteFailure('The server responsed %d.' \
+                % request.status_code)
 
     # Get uTorrent Version
     def version(self):
@@ -49,7 +62,7 @@ def torrents_list(self):
             cookies=self._cookies, auth=self._auth)
         request.encoding = 'utf-8'
         if request.status_code != 200: # Error
-            raise RuntimeError(request.text)
+            raise RemoteFailure('The server reponsed %s.' % request.text)
         result = request.json()
         self._torrents_list_cache = result
         self._refresh_time = time.time()
@@ -95,7 +108,7 @@ def torrent_properties(self, torrent_hash):
                     torrent[0], torrent[2], torrent[11], trackers, status, torrent[3], torrent[7]/1000,
                     torrent[6], sys.maxsize, -1)
         # Not Found
-        raise RuntimeError('No such torrent.')
+        raise NoSuchTorrent('No such torrent.')
 
     # Remove Torrent
     def remove_torrent(self, torrent_hash):

autoremovetorrents/client/transmission.py

@@ -0,0 +1,3 @@
+class ConnectionFailure(RuntimeError):
+    def __init__(self, arg):
+        self.args = arg

autoremovetorrents/client/utorrent.py

@@ -0,0 +1,3 @@
+class DeletionFailure(RuntimeError):
+    def __init__(self, arg):
+        self.args = arg

autoremovetorrents/exception/connectionfailure.py

@@ -1,5 +1,5 @@
 #-*- coding:utf-8 -*-
 
-class LoginFailed(RuntimeError):
+class LoginFailure(RuntimeError):
     def __init__(self, arg):
         self.args = arg

autoremovetorrents/exception/deletionfailure.py

@@ -0,0 +1,3 @@
+class NoSuchTorrent(RuntimeError):
+    def __init__(self, arg):
+        self.args = arg

…oremovetorrents/exception/loginfailed.py …removetorrents/exception/loginfailure.pyautoremovetorrents/exception/loginfailed.py renamed to autoremovetorrents/exception/loginfailure.py autoremovetorrents/exception/loginfailed.py renamed to autoremovetorrents/exception/loginfailure.py

@@ -0,0 +1,3 @@
+class RemoteFailure(RuntimeError):
+    def __init__(self, arg):
+        self.args = arg