Browse Source

[fix] tests ++ flickr error

Adam Tauber 8 years ago
parent
commit
fdf63940e8

+ 1
- 1
searx/engines/flickr.py View File

82
                         'title': photo['title'],
82
                         'title': photo['title'],
83
                         'img_src': img_src,
83
                         'img_src': img_src,
84
                         'thumbnail_src': thumbnail_src,
84
                         'thumbnail_src': thumbnail_src,
85
-                        'content': content = photo['description']['_content'],
85
+                        'content': photo['description']['_content'],
86
                         'author': photo['ownername'],
86
                         'author': photo['ownername'],
87
                         'template': 'images.html'})
87
                         'template': 'images.html'})
88
 
88
 

+ 1
- 1
tests/unit/engines/test_deezer.py View File

42
         self.assertEqual(len(results), 1)
42
         self.assertEqual(len(results), 1)
43
         self.assertEqual(results[0]['title'], 'Title of track')
43
         self.assertEqual(results[0]['title'], 'Title of track')
44
         self.assertEqual(results[0]['url'], 'https://www.deezer.com/track/1094042')
44
         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')
46
         self.assertTrue('100' in results[0]['embedded'])
46
         self.assertTrue('100' in results[0]['embedded'])
47
 
47
 
48
         json = r"""
48
         json = r"""

+ 3
- 3
tests/unit/engines/test_flickr.py View File

52
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
52
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
53
         self.assertTrue('o.jpg' in results[0]['img_src'])
53
         self.assertTrue('o.jpg' in results[0]['img_src'])
54
         self.assertTrue('n.jpg' in results[0]['thumbnail_src'])
54
         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'])
56
         self.assertTrue('Description' in results[0]['content'])
56
         self.assertTrue('Description' in results[0]['content'])
57
 
57
 
58
         json = r"""
58
         json = r"""
76
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
76
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
77
         self.assertTrue('z.jpg' in results[0]['img_src'])
77
         self.assertTrue('z.jpg' in results[0]['img_src'])
78
         self.assertTrue('z.jpg' in results[0]['thumbnail_src'])
78
         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'])
80
         self.assertTrue('Description' in results[0]['content'])
80
         self.assertTrue('Description' in results[0]['content'])
81
 
81
 
82
         json = r"""
82
         json = r"""
100
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
100
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/66847915@N08/15751017054')
101
         self.assertTrue('o.jpg' in results[0]['img_src'])
101
         self.assertTrue('o.jpg' in results[0]['img_src'])
102
         self.assertTrue('o.jpg' in results[0]['thumbnail_src'])
102
         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'])
104
         self.assertTrue('Description' in results[0]['content'])
104
         self.assertTrue('Description' in results[0]['content'])
105
 
105
 
106
         json = r"""
106
         json = r"""

+ 3
- 3
tests/unit/engines/test_flickr_noapi.py View File

145
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
145
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
146
         self.assertIn('k.jpg', results[0]['img_src'])
146
         self.assertIn('k.jpg', results[0]['img_src'])
147
         self.assertIn('n.jpg', results[0]['thumbnail_src'])
147
         self.assertIn('n.jpg', results[0]['thumbnail_src'])
148
-        self.assertIn('Owner', results[0]['content'])
148
+        self.assertIn('Owner', results[0]['author'])
149
 
149
 
150
         # no n size, only the z size
150
         # no n size, only the z size
151
         json = """
151
         json = """
188
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
188
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
189
         self.assertIn('z.jpg', results[0]['img_src'])
189
         self.assertIn('z.jpg', results[0]['img_src'])
190
         self.assertIn('z.jpg', results[0]['thumbnail_src'])
190
         self.assertIn('z.jpg', results[0]['thumbnail_src'])
191
-        self.assertIn('Owner', results[0]['content'])
191
+        self.assertIn('Owner', results[0]['author'])
192
 
192
 
193
         # no z or n size
193
         # no z or n size
194
         json = """
194
         json = """
231
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
231
         self.assertEqual(results[0]['url'], 'https://www.flickr.com/photos/59729010@N00/14001294434')
232
         self.assertIn('o.jpg', results[0]['img_src'])
232
         self.assertIn('o.jpg', results[0]['img_src'])
233
         self.assertIn('o.jpg', results[0]['thumbnail_src'])
233
         self.assertIn('o.jpg', results[0]['thumbnail_src'])
234
-        self.assertIn('Owner', results[0]['content'])
234
+        self.assertIn('Owner', results[0]['author'])
235
 
235
 
236
         # no image test
236
         # no image test
237
         json = """
237
         json = """

+ 1
- 1
tests/unit/engines/test_kickass.py View File

98
         self.assertEqual(len(results), 1)
98
         self.assertEqual(len(results), 1)
99
         self.assertEqual(results[0]['title'], 'This should be the title')
99
         self.assertEqual(results[0]['title'], 'This should be the title')
100
         self.assertEqual(results[0]['url'], 'https://kickass.cd/url.html')
100
         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')
102
         self.assertEqual(results[0]['seed'], 10)
102
         self.assertEqual(results[0]['seed'], 10)
103
         self.assertEqual(results[0]['leech'], 1)
103
         self.assertEqual(results[0]['leech'], 1)
104
         self.assertEqual(results[0]['filesize'], 449)
104
         self.assertEqual(results[0]['filesize'], 449)

+ 0
- 3
tests/unit/engines/test_searchcode_doc.py View File

56
         self.assertEqual(len(results), 1)
56
         self.assertEqual(len(results), 1)
57
         self.assertEqual(results[0]['title'], '[Type] Namespace test')
57
         self.assertEqual(results[0]['title'], '[Type] Namespace test')
58
         self.assertEqual(results[0]['url'], 'http://url')
58
         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'])
62
         self.assertIn('Description', results[0]['content'])
59
         self.assertIn('Description', results[0]['content'])
63
 
60
 
64
         json = r"""
61
         json = r"""

+ 1
- 1
tests/unit/engines/test_spotify.py View File

90
         self.assertEqual(len(results), 1)
90
         self.assertEqual(len(results), 1)
91
         self.assertEqual(results[0]['title'], 'Title of track')
91
         self.assertEqual(results[0]['title'], 'Title of track')
92
         self.assertEqual(results[0]['url'], 'https://open.spotify.com/track/2GzvFiedqW8hgqUpWcASZa')
92
         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')
94
         self.assertIn('1000', results[0]['embedded'])
94
         self.assertIn('1000', results[0]['embedded'])
95
 
95
 
96
         json = """
96
         json = """