From 99c07fed5bc088bab6ede488285b6cd9a9a70148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Wed, 13 Dec 2017 10:58:48 +0100 Subject: [PATCH] Fix travis build --- .travis.yml | 2 -- ogn/collect/database.py | 2 +- ogn/collect/logbook.py | 2 +- ogn/collect/stats.py | 4 ++-- ogn/collect/takeoff_landing.py | 1 - ogn/model/device_stats.py | 4 +--- ogn/model/receiver_stats.py | 4 +--- tests/gateway/test_manage.py | 23 ----------------------- 8 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 tests/gateway/test_manage.py diff --git a/.travis.yml b/.travis.yml index 71fa3f6..ebc54fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,9 @@ before_script: - flake8 tests ogn_test - psql -U postgres -c 'CREATE DATABASE ogn_test;' - psql -U postgres -c 'CREATE EXTENSION postgis;' - - psql -U postgres -d ogn_test script: - nosetests --with-coverage --cover-package=ogn - - pip install . --upgrade - python -c 'import ogn' diff --git a/ogn/collect/database.py b/ogn/collect/database.py index 3954bfe..f5c75ed 100644 --- a/ogn/collect/database.py +++ b/ogn/collect/database.py @@ -249,4 +249,4 @@ def update_country_code(): app.session.commit() - return "Updated country_code for {} Receivers".format(counter) \ No newline at end of file + return "Updated country_code for {} Receivers".format(counter) diff --git a/ogn/collect/logbook.py b/ogn/collect/logbook.py index bd85778..b086459 100644 --- a/ogn/collect/logbook.py +++ b/ogn/collect/logbook.py @@ -1,6 +1,6 @@ from celery.utils.log import get_task_logger -from sqlalchemy import and_, or_, insert, update, between, exists +from sqlalchemy import and_, or_, insert, update, exists from sqlalchemy.sql import func, null from sqlalchemy.sql.expression import true, false diff --git a/ogn/collect/stats.py b/ogn/collect/stats.py index d485987..fe3a069 100644 --- a/ogn/collect/stats.py +++ b/ogn/collect/stats.py @@ -1,10 +1,10 @@ from celery.utils.log import get_task_logger from sqlalchemy import insert, distinct -from sqlalchemy.sql import null, and_, or_, func, not_ +from sqlalchemy.sql import null, and_, func from sqlalchemy.sql.expression import literal_column -from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, DeviceStats, ReceiverStats +from ogn.model import AircraftBeacon, DeviceStats, ReceiverStats from .celery import app diff --git a/ogn/collect/takeoff_landing.py b/ogn/collect/takeoff_landing.py index fcfc739..558a365 100644 --- a/ogn/collect/takeoff_landing.py +++ b/ogn/collect/takeoff_landing.py @@ -5,7 +5,6 @@ from celery.utils.log import get_task_logger from sqlalchemy import and_, or_, insert, between, exists from sqlalchemy.sql import func, null from sqlalchemy.sql.expression import case -from sqlalchemy.orm import aliased from ogn.collect.celery import app from ogn.model import AircraftBeacon, TakeoffLanding, Airport diff --git a/ogn/model/device_stats.py b/ogn/model/device_stats.py index c8748de..b881ad4 100644 --- a/ogn/model/device_stats.py +++ b/ogn/model/device_stats.py @@ -1,6 +1,4 @@ -from geoalchemy2.shape import to_shape -from geoalchemy2.types import Geometry -from sqlalchemy import Column, String, Integer, Date, Float, ForeignKey +from sqlalchemy import Column, Integer, Date, Float, ForeignKey from sqlalchemy.orm import relationship from .base import Base diff --git a/ogn/model/receiver_stats.py b/ogn/model/receiver_stats.py index 2065855..d24e311 100644 --- a/ogn/model/receiver_stats.py +++ b/ogn/model/receiver_stats.py @@ -1,6 +1,4 @@ -from geoalchemy2.shape import to_shape -from geoalchemy2.types import Geometry -from sqlalchemy import Column, String, Integer, Date, Float, ForeignKey +from sqlalchemy import Column, Integer, Date, Float, ForeignKey from sqlalchemy.orm import relationship from .base import Base diff --git a/tests/gateway/test_manage.py b/tests/gateway/test_manage.py deleted file mode 100644 index b4a952d..0000000 --- a/tests/gateway/test_manage.py +++ /dev/null @@ -1,23 +0,0 @@ -import unittest -import unittest.mock as mock - -from ogn.gateway.manage import run -# from ogn.gateway.manage import import_logfile - - -class GatewayManagerTest(unittest.TestCase): - # try simple user interrupt - @mock.patch('ogn.gateway.manage.AprsClient') - def test_run_user_interruption(self, mock_aprs_client): - instance = mock_aprs_client.return_value - instance.run.side_effect = KeyboardInterrupt() - - run(aprs_user="testuser") - - instance.connect.assert_called_once_with() - self.assertEqual(instance.run.call_count, 1) - instance.disconnect.assert_called_once_with() - - -if __name__ == '__main__': - unittest.main()