Review structure and add pytest

Lowess · Nov 22, 2019 · c6e6913 · c6e6913
1 parent 9bbeb4b
commit c6e6913
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 50 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -27,6 +27,14 @@ steps:
     commands:
       - tox -e coverage
 
+  - name: coveralls
+    image: lizheming/drone-coveralls
+    settings:
+      token:
+        from_secret: coveralls_token
+      files:
+        - tests/results/coverage
+
   - name: release
     image: plugins/docker
     settings:
@@ -44,5 +52,4 @@ steps:
 
 volumes:
   - name: pip_cache
-    host:
-      path: /root/.cache/pip
+    temp: {}
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -36,6 +35,7 @@ pip-delete-this-directory.txt
 
 # Unit test / coverage reports
 htmlcov/
+tests/results/coverage*
 .tox/
 .coverage
 .coverage.*
@@ -79,6 +79,7 @@ celerybeat-schedule
 .env
 
 # virtualenv
+.venv/
 venv/
 ENV/
 
@@ -88,5 +89,8 @@ ENV/
 # Rope project settings
 .ropeproject
 
+# Sphinx
+docs/sphinx/_build
+
 # Prometheus
 .prom
diff --git a/karrot/reporters/controllers.py b/karrot/reporters/controllers.py
@@ -3,6 +3,7 @@
 
 import structlog
 from flask import Blueprint, jsonify, current_app as app
+
 logger = structlog.get_logger()
 
 # Define a blueprint

diff --git a/tests/results/coverage b/tests/results/coverage
diff --git a/tests/results/coverage.svg b/tests/results/coverage.svg
diff --git a/tests/units/burrow/test_burrow.py b/tests/units/burrow/test_burrow.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import json
 from prometheus_client import REGISTRY
 from flask import url_for
 

diff --git a/tests/units/config/test_config.py b/tests/units/config/test_config.py
@@ -2,12 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import json
-
-from prometheus_client import REGISTRY
 from flask import url_for
-from moto import mock_cloudwatch
-from karrot.reporters.cloudwatch.models import CloudwatchReporter
 
 logger = logging.getLogger(__name__)
 

diff --git a/tests/units/reporters/test_cloudwatch.py b/tests/units/reporters/test_cloudwatch.py
@@ -2,10 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import json
 
-from prometheus_client import REGISTRY
-from flask import url_for
 from moto import mock_cloudwatch
 from karrot.reporters.cloudwatch.models import CloudwatchReporter
 
@@ -23,7 +20,3 @@ def test_process(self, app, events):
             for event in events:
                 logger.info(f"Sending event to reporter: {event}")
                 reporter.process(event=event)
-
-        # logger.warning(
-        #     REGISTRY.get_sample_value("karrot_reporter_cloudwatch_api_count")
-        # )
diff --git a/tests/units/reporters/test_prometheus.py b/tests/units/reporters/test_prometheus.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import json
 
 from karrot.reporters.prometheus.models import PrometheusReporter
 from prometheus_client import REGISTRY

diff --git a/tests/units/reporters/test_reporter.py b/tests/units/reporters/test_reporter.py
@@ -2,12 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import json
-
-from prometheus_client import REGISTRY
 from flask import url_for
-from moto import mock_cloudwatch
-from karrot.reporters.cloudwatch.models import CloudwatchReporter
 
 logger = logging.getLogger(__name__)
 
@@ -31,6 +26,3 @@ def test_controllers_reporters(self, prometheus, client, tmpdir):
         for reporter in reporters:
             response = client.get(url_for("reporters.display", reporter=reporter))
             assert response.status_code == 200
-
-
-
diff --git a/tox.ini b/tox.ini
@@ -16,6 +16,7 @@ setenv =
     PYTHONPATH = {toxinidir}/
     PYTHONIOENCODING = utf-8
     PYTHONDONTWRITEBYTECODE = 1
+    AWS_DEFAULT_REGION = us-east-1
     # AWS_ACCESS_KEY_ID='testing'
     # AWS_SECRET_ACCESS_KEY='testing'
     # AWS_SECURITY_TOKEN=''
@@ -52,15 +53,14 @@ commands = sphinx-build -W -b html -d {toxinidir}/docs/sphinx/_build/doctrees .
 [testenv:coverage]
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/tests/requirements.txt
-       coveralls
 
 commands = coverage erase
            coverage run setup.py test
            coverage combine
            coverage report
            coverage html
            coverage-badge -f -o {toxinidir}/tests/results/coverage.svg
-           coveralls
+
 ### Pytest settings (equivalent to pytest.ini)
 [pytest]
 xfail_strict = true
@@ -78,4 +78,4 @@ data_file = tests/results/coverage
 
 [coverage:report]
 # Fail if coverage is <70%
-# fail_under=70
+fail_under=70