Trying to resolve file conflict in pull request

This commit is contained in:
lomion 2021-03-15 16:04:15 +01:00
parent 2c520ac3e9
commit 07e43ecf0a

View file

@ -95,7 +95,7 @@ class TestTmdbMethods(unittest.TestCase):
def test_search_tvshow(self): def test_search_tvshow(self):
movie = TvShow() movie = TvShow()
id = movie.search_title('The Flash') id = movie.search_title('The Flash')
self.assertEqual(id, 236) self.assertEqual(id, 60735)
def test_tv_title(self): def test_tv_title(self):
movie = TvShow() movie = TvShow()
@ -106,7 +106,7 @@ class TestTmdbMethods(unittest.TestCase):
movie = TvShow() movie = TvShow()
movie.search_title('The Flash') movie.search_title('The Flash')
#self.assertEqual('Tom Cavanagh', movie.cast[0]) #self.assertEqual('Tom Cavanagh', movie.cast[0])
self.assertEqual('Alex Désert', movie.cast[2]) self.assertEqual('Danielle Panabaker', movie.cast[2])
def test_poster_path(self): def test_poster_path(self):
movie = Movie() movie = Movie()