re-enable test cov

.circleci/config.yml

@@ -73,7 +73,7 @@ jobs:
           name: run regular tests
           command: |
             . venv/bin/activate
-            py.test --cov=irrd irrd --junitxml=test-reports/junit.xml
+            py.test --cov=irrd irrd --junitxml=test-reports/junit.xml --cov-fail-under=100
 
       - run:
           name: run integration tests

irrd/conf/__init__.py

@@ -269,7 +269,8 @@ def config_init(config_path):
 
 
 def is_config_initialised():
-    return bool(configuration)
+    global configuration
+    return configuration is not None
 
 
 def get_setting(setting_name: str, default: Any=None) -> Any:

irrd/conf/test_conf.py

@@ -5,7 +5,7 @@
 import yaml
 from typing import Dict
 
-from . import get_setting, ConfigurationError, config_init
+from . import get_setting, ConfigurationError, config_init, is_config_initialised
 
 
 @pytest.fixture()
@@ -87,6 +87,7 @@ def test_load_valid_reload_valid_config(self, monkeypatch, save_yaml_config, tmp
         }
         save_yaml_config(config)
         assert list(get_setting('sources_default')) == ['TESTDB2', 'TESTDB']
+        assert is_config_initialised()
 
         config['irrd']['sources_default'] = ['TESTDB2']
         save_yaml_config(config, run_init=False)

irrd/integration_tests/run.py

@@ -20,6 +20,10 @@
 
 
 class TestIntegration:
+    """
+    Note that this test will not be included in the default py.test discovery,
+    this is intentional.
+    """
     def test_irrd_integration(self, tmpdir):
         # IRRD_DATABASE_URL overrides the yaml config, so should be removed
         del os.environ['IRRD_DATABASE_URL']

setup.cfg

@@ -19,6 +19,7 @@ omit =
     irrd/storage/alembic/*
     irrd/scripts/query_qa_comparison.py
     irrd/scripts/database_upgrade.py
+    irrd/integration_tests/*
 
 [tool:pytest]
 log_level=INFO