fdf6394 · searx · git.iko.soy

git.iko.soy/searx

[fix] tests ++ flickr error

commitfdf63940e8e576aee9fe5e03337d39e771f24514 authorAdam Tauber <asciimoo@gmail.com> dateFri 9 Dec 2016, 19:10 (10 years ago) parentef2ef79

7 files changed+10−13

compare with master

unifiedsplit

searx/engines/flickr.py+1−1 tests/unit/engines/test_deezer.py+1−1 tests/unit/engines/test_flickr.py+3−3 tests/unit/engines/test_flickr_noapi.py+3−3 tests/unit/engines/test_kickass.py+1−1 tests/unit/engines/test_searchcode_doc.py−3 tests/unit/engines/test_spotify.py+1−1

searx/engines/flickr.py+1−1

@@ -82,7 +82,7 @@ def response(resp):

8282 'title': photo['title'],

8383 'img_src': img_src,

8484 'thumbnail_src': thumbnail_src,

85− 'content': content = photo['description']['_content'],

85+ 'content': photo['description']['_content'],

8686 'author': photo['ownername'],

8787 'template': 'images.html'})

8888

tests/unit/engines/test_deezer.py+1−1

@@ -42,7 +42,7 @@ class TestDeezerEngine(SearxTestCase):

4242 self.assertEqual(len(results), 1)

4343 self.assertEqual(results[0]['title'], 'Title of track')

4444 self.assertEqual(results[0]['url'], 'https://www.deezer.com/track/1094042')

45− self.assertEqual(results[0]['content'], 'Artist Name • Album Title • Title of track')

45+ self.assertEqual(results[0]['content'], 'Artist Name - Album Title - Title of track')

4646 self.assertTrue('100' in results[0]['embedded'])

4747

4848 json = r"""

tests/unit/engines/test_flickr.py+3−3

@@ -52,7 +52,7 @@ class TestFlickrEngine(SearxTestCase):

5252 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')

5353 self.assertTrue('o.jpg' in results[0]['img_src'])

5454 self.assertTrue('n.jpg' in results[0]['thumbnail_src'])

55− self.assertTrue('Owner' in results[0]['content'])

55+ self.assertTrue('Owner' in results[0]['author'])

5656 self.assertTrue('Description' in results[0]['content'])

5757

5858 json = r"""

@@ -76,7 +76,7 @@ class TestFlickrEngine(SearxTestCase):

7676 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')

7777 self.assertTrue('z.jpg' in results[0]['img_src'])

7878 self.assertTrue('z.jpg' in results[0]['thumbnail_src'])

79− self.assertTrue('Owner' in results[0]['content'])

79+ self.assertTrue('Owner' in results[0]['author'])

8080 self.assertTrue('Description' in results[0]['content'])

8181

8282 json = r"""

@@ -100,7 +100,7 @@ class TestFlickrEngine(SearxTestCase):

100100 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')

101101 self.assertTrue('o.jpg' in results[0]['img_src'])

102102 self.assertTrue('o.jpg' in results[0]['thumbnail_src'])

103− self.assertTrue('Owner' in results[0]['content'])

103+ self.assertTrue('Owner' in results[0]['author'])

104104 self.assertTrue('Description' in results[0]['content'])

105105

106106 json = r"""

tests/unit/engines/test_flickr_noapi.py+3−3

@@ -145,7 +145,7 @@ class TestFlickrNoapiEngine(SearxTestCase):

145145 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')

146146 self.assertIn('k.jpg', results[0]['img_src'])

147147 self.assertIn('n.jpg', results[0]['thumbnail_src'])

148− self.assertIn('Owner', results[0]['content'])

148+ self.assertIn('Owner', results[0]['author'])

149149

150150 # no n size, only the z size

151151 json = """

@@ -188,7 +188,7 @@ class TestFlickrNoapiEngine(SearxTestCase):

188188 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')

189189 self.assertIn('z.jpg', results[0]['img_src'])

190190 self.assertIn('z.jpg', results[0]['thumbnail_src'])

191− self.assertIn('Owner', results[0]['content'])

191+ self.assertIn('Owner', results[0]['author'])

192192

193193 # no z or n size

194194 json = """

@@ -231,7 +231,7 @@ class TestFlickrNoapiEngine(SearxTestCase):

231231 self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')

232232 self.assertIn('o.jpg', results[0]['img_src'])

233233 self.assertIn('o.jpg', results[0]['thumbnail_src'])

234− self.assertIn('Owner', results[0]['content'])

234+ self.assertIn('Owner', results[0]['author'])

235235

236236 # no image test

237237 json = """

tests/unit/engines/test_kickass.py+1−1

@@ -98,7 +98,7 @@ class TestKickassEngine(SearxTestCase):

9898 self.assertEqual(len(results), 1)

9999 self.assertEqual(results[0]['title'], 'This should be the title')

100100 self.assertEqual(results[0]['url'], 'https://kickass.cd/url.html')

101− self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')

101+ self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')

102102 self.assertEqual(results[0]['seed'], 10)

103103 self.assertEqual(results[0]['leech'], 1)

104104 self.assertEqual(results[0]['filesize'], 449)

tests/unit/engines/test_searchcode_doc.py−3

@@ -56,9 +56,6 @@ class TestSearchcodeDocEngine(SearxTestCase):

5656 self.assertEqual(len(results), 1)

5757 self.assertEqual(results[0]['title'], '[Type] Namespace test')

5858 self.assertEqual(results[0]['url'], 'http://url')

59− self.assertIn('Synopsis', results[0]['content'])

60− self.assertIn('Type', results[0]['content'])

61− self.assertIn('test', results[0]['content'])

6259 self.assertIn('Description', results[0]['content'])

6360

6461 json = r"""

tests/unit/engines/test_spotify.py+1−1

@@ -90,7 +90,7 @@ class TestSpotifyEngine(SearxTestCase):

9090 self.assertEqual(len(results), 1)

9191 self.assertEqual(results[0]['title'], 'Title of track')

9292 self.assertEqual(results[0]['url'], 'https://open.spotify.com/track/2GzvFiedqW8hgqUpWcASZa')

93− self.assertEqual(results[0]['content'], 'Artist Name • Album Title • Title of track')

93+ self.assertEqual(results[0]['content'], 'Artist Name - Album Title - Title of track')

9494 self.assertIn('1000', results[0]['embedded'])

9595

9696 json = """