Some small fixes

Author: FlyingBird95

flask_monitoringdashboard/database/request.py

@@ -16,6 +16,13 @@ def get_latencies_sample(session, endpoint_id, interval, sample_size=500):
         .filter(Request.endpoint_id == endpoint_id, *criterion)
         .limit(sample_size)
     )
+    # return random rows: See https://stackoverflow.com/a/60815
+    dialect = session.bind.dialect.name
+
+    if dialect == 'sqlite':
+        query = query.order_by(func.random())
+    elif dialect == 'mysql':
+        query = query.order_by(func.rand())
 
     return [item.duration for item in query.all()]
 

migration/migrate_v1_to_v2.py

@@ -1,7 +1,6 @@
-"""
-    Use this file for migrating the Database from v1.X.X to v2.X.X
-    Before running the script, make sure to change the OLD_DB_URL and NEW_DB_URL on lines 9 and 10.
-    Refer to http://docs.sqlalchemy.org/en/latest/core/engines.html on how to configure this.
+"""Use this file for migrating the Database from v1.X.X to v2.X.X
+Before running the script, make sure to change the OLD_DB_URL and NEW_DB_URL on lines 9 and 10.
+Refer to http://docs.sqlalchemy.org/en/latest/core/engines.html on how to configure this.
 """
 import datetime
 from contextlib import contextmanager
@@ -47,10 +46,9 @@ def get_connection(db_url):
 
 @contextmanager
 def session_scope():
-    """
-    When accessing the database, use the following syntax:
-        with session_scope() as session:
-            session.query(...)
+    """When accessing the database, use the following syntax:
+    >>> with session_scope() as session:
+    >>>     session.query(...)
 
     :return: the session for accessing the database
     """

tests/unit/core/config/test_config.py

@@ -41,9 +41,3 @@ def test_parser():
     assert parse_literal(parser, section, 'literal', 'default') == ['a', 'b', 'c']
     assert parse_literal(parser, section, 'literal2', 'default') == 1.23
 
-
-def test_environment_vars():
-    """Test whether environment variables can be read."""
-
-    os.environ['ENVIRONMENT_VAR'] = 'abc'
-    assert get_environment_var('ENVIRONMENT_VAR') == 'abc'

tests/unit/database/test_endpoint.py

@@ -13,29 +13,25 @@
 
 
 def test_get_endpoint(session, endpoint):
-    """Test whether the function returns the right values."""
     endpoint2 = get_endpoint_by_name(session, endpoint.name)
     assert endpoint.name == endpoint2.name
     assert endpoint.id == endpoint2.id
 
 
 @pytest.mark.parametrize('endpoint__monitor_level', [1])
 def test_update_endpoint(session, endpoint):
-    """Test whether the function returns the right values."""
     update_endpoint(session, endpoint.name, 2)
     assert get_endpoint_by_name(session, endpoint.name).monitor_level == 2
 
 
 @pytest.mark.parametrize('timestamp', [datetime(2020, 2, 2), datetime(2020, 3, 3)])
 def test_update_last_accessed(session, endpoint, timestamp):
-    """Test whether the function returns the right values."""
     update_last_requested(session, endpoint.name, timestamp=timestamp)
     result = get_value(get_last_requested(session), endpoint.name)
     assert result == timestamp
 
 
 def test_endpoints(session, endpoint):
-    """Test whether the function returns the right values."""
     endpoints = get_endpoints(session)
     assert endpoints.count() == session.query(Endpoint).count()
     assert [endpoint.id == e.id for e in endpoints]  # check that the endpoint is included.

tests/unit/database/test_outlier.py

@@ -11,7 +11,6 @@
 
 
 def test_add_outlier(session, request_1):
-    """Test whether the function returns the right values."""
     assert not request_1.outlier
 
     add_outlier(
@@ -27,22 +26,19 @@ def test_add_outlier(session, request_1):
 
 
 def test_get_outliers(session, outlier_1, endpoint):
-    """Test whether the function returns the right values."""
     outliers = get_outliers_sorted(session, endpoint_id=endpoint.id, offset=0, per_page=10)
     assert len(outliers) == 1
     assert outliers[0].id == outlier_1.id
 
 
 @pytest.mark.usefixtures('outlier_1', 'outlier_2')
 def test_count_outliers(session, endpoint):
-    """Test whether the function returns the right values."""
     assert count_outliers(session, endpoint.id) == 2
 
 
 @pytest.mark.usefixtures('outlier_1', 'outlier_2')
 @pytest.mark.parametrize('outlier_1__cpu_percent', ['[0, 1, 2, 3]'])
 @pytest.mark.parametrize('outlier_2__cpu_percent', ['[1, 2, 3, 4]'])
 def test_get_outliers_cpus(session, endpoint):
-    """Test whether the function returns the right values."""
     expected_cpus = ['[{0}, {1}, {2}, {3}]'.format(i, i + 1, i + 2, i + 3) for i in range(2)]
     assert get_outliers_cpus(session, endpoint.id) == expected_cpus

tests/unit/database/test_request.py

@@ -10,7 +10,6 @@
 import pytest
 
 from flask_monitoringdashboard.core.date_interval import DateInterval
-from flask_monitoringdashboard.database import session_scope
 from flask_monitoringdashboard.database.count import count_requests
 from flask_monitoringdashboard.database.endpoint import get_avg_duration, get_endpoints
 from flask_monitoringdashboard.database.request import add_request, get_date_of_first_request, get_latencies_sample
@@ -23,25 +22,21 @@ def test_get_latencies_sample(session, request_1, endpoint):
     assert data == [request_1.duration]
 
 
-def test_add_request(endpoint):
-    """Test whether the function returns the right values."""
-    # For some reason, using the session-fixture here doesn't work.
+def test_add_request(endpoint, session):
     num_requests = len(endpoint.requests)
-    with session_scope() as session:
-        add_request(
-            session,
-            duration=200,
-            endpoint_id=endpoint.id,
-            ip='127.0.0.1',
-            group_by=None,
-            status_code=200,
-        )
-        assert count_requests(session, endpoint.id) == num_requests + 1
+    add_request(
+        session,
+        duration=200,
+        endpoint_id=endpoint.id,
+        ip='127.0.0.1',
+        group_by=None,
+        status_code=200,
+    )
+    assert count_requests(session, endpoint.id) == num_requests + 1
 
 
 @pytest.mark.parametrize('request_1__time_requested', [datetime(2020, 2, 3)])
 def test_get_versions(session, request_1):
-    """Test whether the function returns the right values."""
     for version, first_request in get_versions(session):
         if version == request_1.version_requested:
             assert first_request == request_1.time_requested
@@ -50,14 +45,12 @@ def test_get_versions(session, request_1):
 
 
 def test_get_endpoints(session, endpoint):
-    """Test whether the function returns the right values."""
     endpoints = get_endpoints(session)
     assert endpoint.name in [endpoint.name for endpoint in endpoints]
 
 
 @pytest.mark.parametrize('request_1__time_requested', [datetime(1970, 1, 1)])
 def test_get_date_of_first_request(session, request_1):
-    """Test whether the function returns the right values."""
     total_seconds = int(time.mktime(request_1.time_requested.timetuple()))
     assert get_date_of_first_request(session) == total_seconds