Skip to content

Commit 0e2c7fb

Browse files
committed
fixup
move delete to partial as not everything is deletable fix library genre test fix delete media.
1 parent 5ef90f3 commit 0e2c7fb

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

plexapi/base.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,6 @@ def _castAttrValue(self, op, query, value):
251251
def _loadData(self, data):
252252
raise NotImplementedError('Abstract method not implemented.')
253253

254-
def delete(self):
255-
try:
256-
return self._server.query(self.key, method=self._server._session.delete)
257-
except BadRequest:
258-
log.error("Failed to delete %s. This could be because you havn't allowed "
259-
"items to be deleted" % self.key)
260-
raise
261-
262254

263255
class PlexPartialObject(PlexObject):
264256
""" Not all objects in the Plex listings return the complete list of elements
@@ -267,6 +259,14 @@ class PlexPartialObject(PlexObject):
267259
automatically and update itself.
268260
"""
269261

262+
def delete(self):
263+
try:
264+
return self._server.query(self.key, method=self._server._session.delete)
265+
except BadRequest:
266+
log.error("Failed to delete %s. This could be because you havn't allowed "
267+
"items to be deleted" % self.key)
268+
raise
269+
270270
def __eq__(self, other):
271271
return other is not None and self.key == other.key
272272

tests/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ def monkeydownload(request, monkeypatch):
163163

164164

165165
def callable_http_patch():
166+
"""This intented to stop some http requests inside some tests."""
166167
return patch('plexapi.server.requests.sessions.Session.send',
167168
return_value=MagicMock(status_code=200,
168169
text='<xml><child></child></xml>'))
@@ -176,6 +177,7 @@ def empty_response(mocker):
176177

177178
@pytest.fixture()
178179
def patched_http_call(mocker):
180+
"""This will stop any http calls inside any test."""
179181
return mocker.patch('plexapi.server.requests.sessions.Session.send',
180182
return_value=MagicMock(status_code=200,
181183
text='<xml><child></child></xml>')

tests/test_library.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ def test_library_MovieSection_refresh(movies, patched_http_call):
128128

129129

130130
def test_library_MovieSection_search_genre(movie, movies):
131-
# assert len(movie.genres[0].items()) # TODO
132-
assert len(movies.search(genre=movie.genres[0])) > 1
131+
assert len(movies.search(genre=animation[0])) > 1
133132

134133

135134
def test_library_MovieSection_cancelUpdate(movies):

tests/test_video.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ def test_video_Movie_delete_part(movie, mocker):
6464
# we need to reload this as there is a bug in part.delete
6565
# See https://github.com/pkkid/python-plexapi/issues/201
6666
m = movie.reload()
67-
for part in m.iterParts():
67+
for media in m.media:
6868
with utils.callable_http_patch():
69-
part.delete()
69+
media.delete()
7070

7171

7272
def test_video_Movie_iterParts(movie):

0 commit comments

Comments
 (0)