Merge pull request #453 from pkkid/tests

Tests

Author: Hellowlol

plexapi/client.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 import time
-import requests
 
-from requests.status_codes import _codes as codes
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT
-from plexapi import log, logfilter, utils
+import requests
+from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
 from plexapi.base import PlexObject
 from plexapi.compat import ElementTree
 from plexapi.exceptions import BadRequest, Unauthorized, Unsupported
 from plexapi.playqueue import PlayQueue
-
+from requests.status_codes import _codes as codes
 
 DEFAULT_MTYPE = 'video'
 
@@ -548,9 +546,9 @@ def setStreams(self, audioStreamID=None, subtitleStreamID=None, videoStreamID=No
 
     # -------------------
     # Timeline Commands
-    def timeline(self):
+    def timeline(self, wait=1):
         """ Poll the current timeline and return the XML response. """
-        return self.sendCommand('timeline/poll', wait=1)
+        return self.sendCommand('timeline/poll', wait=wait)
 
     def isPlayingMedia(self, includePaused=False):
         """ Returns True if any media is currently playing.
@@ -559,7 +557,7 @@ def isPlayingMedia(self, includePaused=False):
                 includePaused (bool): Set True to treat currently paused items
                     as playing (optional; default True).
         """
-        for mediatype in self.timeline():
+        for mediatype in self.timeline(wait=0):
             if mediatype.get('state') == 'playing':
                 return True
             if includePaused and mediatype.get('state') == 'paused':

plexapi/library.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from plexapi import X_PLEX_CONTAINER_SIZE, log, utils
 from plexapi.base import PlexObject
-from plexapi.compat import unquote, urlencode, quote_plus
-from plexapi.media import MediaTag
+from plexapi.compat import quote_plus, unquote, urlencode
 from plexapi.exceptions import BadRequest, NotFound
+from plexapi.media import MediaTag
 from plexapi.settings import Setting
 
 
@@ -366,6 +366,9 @@ def delete(self):
             log.error(msg)
             raise
 
+    def reload(self, key=None):
+        return self._server.library.section(self.title)
+
     def edit(self, agent=None, **kwargs):
         """ Edit a library (Note: agent is required). See :class:`~plexapi.library.Library` for example usage.
 
@@ -1013,9 +1016,11 @@ class Collections(PlexObject):
 
     TAG = 'Directory'
     TYPE = 'collection'
+    _include = "?includeExternalMedia=1&includePreferences=1"
 
     def _loadData(self, data):
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self._details_key = "/library/metadata/%s%s" % (self.ratingKey, self._include)
         self.key = data.attrib.get('key')
         self.type = data.attrib.get('type')
         self.title = data.attrib.get('title')

plexapi/media.py

@@ -2,7 +2,7 @@
 
 import xml
 
-from plexapi import compat, log, utils, settings
+from plexapi import compat, log, settings, utils
 from plexapi.base import PlexObject
 from plexapi.exceptions import BadRequest
 from plexapi.utils import cast

plexapi/utils.py

@@ -2,15 +2,16 @@
 import logging
 import os
 import re
-import requests
 import time
 import zipfile
 from datetime import datetime
 from getpass import getpass
-from threading import Thread, Event
-from tqdm import tqdm
+from threading import Event, Thread
+
+import requests
 from plexapi import compat
 from plexapi.exceptions import NotFound
+from tqdm import tqdm
 
 log = logging.getLogger('plexapi')
 
@@ -67,10 +68,13 @@ def cast(func, value):
     """
     if value is not None:
         if func == bool:
-            try:
-                return bool(int(value))
-            except ValueError:
-                return bool(value)
+            if value in (1, True, "1", "true"):
+                return True
+            elif value in (0, False, "0", "false"):
+                return False
+            else:
+                raise ValueError(value)
+
         elif func in (int, float):
             try:
                 return func(value)

tests/conftest.py

@@ -1,22 +1,23 @@
 # -*- coding: utf-8 -*-
-import plexapi
-import pytest
-import requests
 import time
 from datetime import datetime
 from functools import partial
 from os import environ
+
+import plexapi
+import pytest
+import requests
+from plexapi import compat
+from plexapi.client import PlexClient
+from plexapi.compat import MagicMock, patch
 from plexapi.myplex import MyPlexAccount
+from plexapi.server import PlexServer
 
 try:
     from unittest.mock import patch, MagicMock, mock_open
 except ImportError:
     from mock import patch, MagicMock, mock_open
 
-from plexapi import compat
-from plexapi.compat import patch, MagicMock
-from plexapi.client import PlexClient
-from plexapi.server import PlexServer
 
 SERVER_BASEURL = plexapi.CONFIG.get('auth.server_baseurl')
 MYPLEX_USERNAME = plexapi.CONFIG.get('auth.myplex_username')
@@ -147,13 +148,13 @@ def fresh_plex():
 
 
 @pytest.fixture()
-def plex2():
+def plex2(plex):
     return plex()
 
 
 @pytest.fixture()
-def client(request):
-    return PlexClient(plex(), baseurl=CLIENT_BASEURL, token=CLIENT_TOKEN)
+def client(request, plex):
+    return PlexClient(plex, baseurl=CLIENT_BASEURL, token=CLIENT_TOKEN)
 
 
 @pytest.fixture()
@@ -185,13 +186,12 @@ def movie(movies):
 def collection(plex, movie):
 
     try:
-        plex.library.section('Movies').collection()[0]
+        return plex.library.section('Movies').collection()[0]
     except IndexError:
         movie.addCollection(["marvel"])
 
-    sec = plex.library.section('Movies').reload()
-
-    return sec.collection()[0]
+        n = plex.library.section('Movies').reload()
+        return n.collection()[0]
 
 
 @pytest.fixture()
@@ -225,7 +225,8 @@ def photoalbum(photos):
         return photos.get('Cats')
     except Exception:
         return photos.get('photo_album1')
-    
+
+
 @pytest.fixture()
 def subtitle():
     mopen = mock_open()

tests/test_audio.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
+
 from . import conftest as utils
 
 
@@ -34,7 +35,7 @@ def test_audio_Artist_get(artist, music):
 
 def test_audio_Artist_history(artist):
     history = artist.history()
-    assert len(history)
+    assert isinstance(history, list)
 
 
 def test_audio_Artist_track(artist):
@@ -87,12 +88,12 @@ def test_audio_Album_attrs(album):
 
 def test_audio_Album_history(album):
     history = album.history()
-    assert len(history)
+    assert isinstance(history, list)
 
 
 def test_audio_Track_history(track):
     history = track.history()
-    assert len(history)
+    assert isinstance(history, list)
 
 
 def test_audio_Album_tracks(album):
@@ -228,7 +229,7 @@ def test_audio_Track_attrs(album):
     assert track.parentTitle == 'Unmastered Impulses'
     assert track.playlistItemID is None
     assert track.primaryExtraKey is None
-    # assert track.ratingCount == 9
+    #assert utils.is_int(track.ratingCount)
     assert utils.is_int(track.ratingKey)
     assert track._server._baseurl == utils.SERVER_BASEURL
     assert track.sessionKey is None