diff options
| author | Noémi Ványi <sitbackandwait@gmail.com> | 2019-01-07 21:28:58 +0100 |
|---|---|---|
| committer | Noémi Ványi <sitbackandwait@gmail.com> | 2019-01-07 21:28:58 +0100 |
| commit | 97351a2c725ce620d452c62da07379130bafdb95 (patch) | |
| tree | 00d4783b39625ca01c61aa4f04cb88250b21dffc /tests | |
| parent | b63d645a52d663036b97e31a59818d79faa4da81 (diff) | |
| download | searxng-97351a2c725ce620d452c62da07379130bafdb95.tar.gz searxng-97351a2c725ce620d452c62da07379130bafdb95.zip | |
fix after rebase
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/engines/test_wikipedia.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index 93b3a5ab1..316b12bc5 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase): self.assertIn('Test_Query', params['url']) self.assertNotIn('test_query', params['url']) -<<<<<<< HEAD dicto['language'] = 'nb' params = wikipedia.request(query, dicto) self.assertIn('no.wikipedia.org', params['url']) -======= dicto['language'] = 'all' params = wikipedia.request(query, dicto) self.assertIn('en', params['url']) ->>>>>>> Revert "remove 'all' option from search languages" dicto['language'] = 'xx' params = wikipedia.request(query, dicto) |