test: Ensure skippable tests are always run in CI

open-contracting · Aug 30, 2021 · 977d622 · 977d622
1 parent ac40973
commit 977d622
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/kingfisher_scrapy/extensions.py b/kingfisher_scrapy/extensions.py
@@ -1,7 +1,6 @@
 # https://docs.scrapy.org/en/latest/topics/extensions.html#writing-your-own-extension
 import csv
 import json
-import logging
 import os
 from datetime import datetime
 from urllib.parse import parse_qs, urlencode, urljoin, urlsplit

diff --git a/tests/extensions/test_kingfisher_database_store.py b/tests/extensions/test_kingfisher_database_store.py
@@ -11,6 +11,7 @@
 from tests import spider_with_crawler
 
 database_url = os.getenv('KINGFISHER_COLLECT_DATABASE_URL')
+skip_test_if = not database_url and not os.getenv('CI')
 
 
 def test_from_crawler_missing_arguments():
@@ -28,7 +29,7 @@ def test_from_crawler_missing_arguments():
     assert str(excinfo.value) == 'FILES_STORE is not set.'
 
 
-@pytest.mark.skipif(not database_url, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
+@pytest.mark.skipif(skip_test_if, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
 @pytest.mark.parametrize('from_date,default_from_date,date_format', [
     (None, None, None),
     ('2020-01-01', None, 'date'),
@@ -60,7 +61,7 @@ def test_spider_opened_first_time(caplog, tmpdir, from_date, default_from_date,
         connection.close()
 
 
-@pytest.mark.skipif(not database_url, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
+@pytest.mark.skipif(skip_test_if, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
 def test_spider_closed_error(caplog, tmpdir):
     spider = spider_with_crawler(crawl_time='2021-05-25T00:00:00',
                                  settings={'DATABASE_URL': database_url, 'FILES_STORE': tmpdir})
@@ -72,7 +73,7 @@ def test_spider_closed_error(caplog, tmpdir):
     assert not caplog.records
 
 
-@pytest.mark.skipif(not database_url, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
+@pytest.mark.skipif(skip_test_if, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
 @pytest.mark.parametrize('data,data_type,sample,compile_releases', [
     (b'{"releases": [{"date": "2021-05-26T10:00:00Z"}]}', 'release_package', None, False),
     (b'{"releases": [{"date": "2021-05-26T10:00:00Z"}]}', 'release_package', 1, False),
@@ -140,7 +141,7 @@ def test_spider_closed(caplog, tmpdir, data, data_type, sample, compile_releases
         connection.close()
 
 
-@pytest.mark.skipif(not database_url, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
+@pytest.mark.skipif(skip_test_if, reason='KINGFISHER_COLLECT_DATABASE_URL must be set')
 def test_spider_opened_with_data(caplog, tmpdir):
     spider = spider_with_crawler(crawl_time='2021-05-25T00:00:00',
                                  settings={'DATABASE_URL': database_url, 'FILES_STORE': tmpdir})

diff --git a/tests/extensions/test_kingfisher_process_api2.py b/tests/extensions/test_kingfisher_process_api2.py
@@ -1,5 +1,5 @@
-import os
 import logging
+import os
 from unittest.mock import MagicMock
 
 import pytest
@@ -46,7 +46,7 @@ def json(self):
         return self.content
 
 
-@pytest.mark.skipif(not rabbit_url, reason='RABBIT_URL must be set')
+@pytest.mark.skipif(not rabbit_url and not os.getenv('CI'), reason='RABBIT_URL must be set')
 @pytest.mark.parametrize('url,boolean', [(rabbit_url, True), ('', False)])
 def test_from_crawler(url, boolean):
     spider = spider_with_crawler(settings={