git.iko.soy/searx
on master help sign in
Correct a few UT
56ad00bCqoicebordel
searx/tests/engines/test_blekko_images.py+8−3
compare with master
unifiedsplit
@@ -12,9 +12,14 @@ class TestBlekkoImagesEngine(SearxTestCase):
12 dicto['pageno'] = 0
12 dicto['pageno'] = 0
13 dicto['safesearch'] = 1
13 dicto['safesearch'] = 1
14 params = blekko_images.request(query, dicto)
14 params = blekko_images.request(query, dicto)
15− self.assertTrue('url' in params)
15+ self.assertIn('url', params)
16− self.assertTrue(query in params['url'])
16+ self.assertIn(query, params['url'])
17− self.assertTrue('blekko.com' in params['url'])
17+ self.assertIn('blekko.com', params['url'])
18+ self.assertIn('page', params['url'])
19+
20+ dicto['pageno'] = 1
21+ params = blekko_images.request(query, dicto)
22+ self.assertNotIn('page', params['url'])
18
23
19 def test_response(self):
24 def test_response(self):
20 self.assertRaises(AttributeError, blekko_images.response, None)
25 self.assertRaises(AttributeError, blekko_images.response, None)
searx/tests/engines/test_google_images.py+8−3
@@ -11,9 +11,14 @@ class TestGoogleImagesEngine(SearxTestCase):
11 dicto = defaultdict(dict)
11 dicto = defaultdict(dict)
12 dicto['pageno'] = 1
12 dicto['pageno'] = 1
13 params = google_images.request(query, dicto)
13 params = google_images.request(query, dicto)
14− self.assertTrue('url' in params)
14+ self.assertIn('url', params)
15− self.assertTrue(query in params['url'])
15+ self.assertIn(query, params['url'])
16− self.assertTrue('googleapis.com' in params['url'])
16+ self.assertIn('googleapis.com', params['url'])
17+ self.assertIn('safe=on', params['url'])
18+
19+ dicto['safesearch'] = 0
20+ params = google_images.request(query, dicto)
21+ self.assertIn('safe=off', params['url'])
17
22
18 def test_response(self):
23 def test_response(self):
19 self.assertRaises(AttributeError, google_images.response, None)
24 self.assertRaises(AttributeError, google_images.response, None)
searx/tests/engines/test_yahoo.py+2−12
@@ -75,12 +75,6 @@ class TestYahooEngine(SearxTestCase):
75 <li>
75 <li>
76 <div class="dd algo lst Sr">
76 <div class="dd algo lst Sr">
77 <div class="compTitle">
77 <div class="compTitle">
78− <h3 class="title"><a class=" td-u" href="http://r.search.yahoo.com/_ylt=AwrBT7zgEudUW.wAe2ZXNyoA;
79− _ylu=X3oDMTBybGY3bmpvBGNvbG8DYmYxBHBvcwMyBHZ0aWQDBHNlYwNzcg--/RV=2\/RE=1424458593/RO=10
80− /RU=https%3a%2f%2fthis.is.the.second.url%2f/RK=0/RS=jIctjj_cBH1Efj88GCgHKp3__Qk-"
81− target="_blank" data-bid="54e712e136926">
82− This is the second <b><b>title</b></b></a>
83− </h3>
84 </div>
78 </div>
85 <div class="compText aAbs">
79 <div class="compText aAbs">
86 <p class="lh-18">This is the second content</p>
80 <p class="lh-18">This is the second content</p>
@@ -102,16 +96,12 @@ class TestYahooEngine(SearxTestCase):
102 """
96 """
103 response = mock.Mock(text=html)
97 response = mock.Mock(text=html)
104 results = yahoo.response(response)
98 results = yahoo.response(response)
105− print results
106 self.assertEqual(type(results), list)
99 self.assertEqual(type(results), list)
107− self.assertEqual(len(results), 3)
100+ self.assertEqual(len(results), 2)
108 self.assertEqual(results[0]['title'], 'This is the title')
101 self.assertEqual(results[0]['title'], 'This is the title')
109 self.assertEqual(results[0]['url'], 'https://this.is.the.url/')
102 self.assertEqual(results[0]['url'], 'https://this.is.the.url/')
110 self.assertEqual(results[0]['content'], 'This is the content')
103 self.assertEqual(results[0]['content'], 'This is the content')
111− self.assertEqual(results[1]['title'], 'This is the second title')
112− self.assertEqual(results[1]['url'], 'https://this.is.the.second.url/')
113− self.assertEqual(results[1]['content'], 'This is the second content')
114− self.assertEqual(results[2]['suggestion'], 'This is the suggestion')
104+ self.assertEqual(results[1]['suggestion'], 'This is the suggestion')
115
105
116 html = """
106 html = """
117<ol class="reg mb-15 searchCenterMiddle">
107<ol class="reg mb-15 searchCenterMiddle">