From b53695d3614b1610145eb5321e5f55e685774889 Mon Sep 17 00:00:00 2001
From: Sasha Romijn <github@mxsasha.eu>
Date: Mon, 14 Jan 2019 16:19:12 +0100
Subject: [PATCH] re-enable test cov

---
 .circleci/config.yml          | 2 +-
 irrd/conf/__init__.py         | 3 ++-
 irrd/conf/test_conf.py        | 3 ++-
 irrd/integration_tests/run.py | 4 ++++
 setup.cfg                     | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 75f98a38b..de5992bec 100644
--- a/.circleci/config.yml
+++ b/.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
diff --git a/irrd/conf/__init__.py b/irrd/conf/__init__.py
index 4852b0036..1911f691f 100644
--- a/irrd/conf/__init__.py
+++ b/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:
diff --git a/irrd/conf/test_conf.py b/irrd/conf/test_conf.py
index 4ff8c281a..b4aa6c4a5 100644
--- a/irrd/conf/test_conf.py
+++ b/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)
diff --git a/irrd/integration_tests/run.py b/irrd/integration_tests/run.py
index 0297fe4d6..2c9023849 100644
--- a/irrd/integration_tests/run.py
+++ b/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']
diff --git a/setup.cfg b/setup.cfg
index e24ecaf95..379bc7b18 100644
--- a/setup.cfg
+++ b/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