Fix build

tests/gateway/test_merger.py

@@ -19,7 +19,7 @@ class MergerTest(unittest.TestCase):
 
         merger.add_message(b)
         callback.add_message.assert_not_called()
-        
+
         merger.add_message(c)
         callback.add_message.assert_not_called()
 
@@ -31,8 +31,8 @@ class MergerTest(unittest.TestCase):
         callback.add_message.assert_has_calls(calls, any_order=True)
 
     def test_pair(self):
-        a = {'name': 'Jeff', 'receiver_name': 'Observer1','timestamp': datetime.datetime(2018, 5, 20, 18, 4, 45), 'field_a': None, 'field_b': 3.141}
+        a = {'name': 'Jeff', 'receiver_name': 'Observer1', 'timestamp': datetime.datetime(2018, 5, 20, 18, 4, 45), 'field_a': None, 'field_b': 3.141}
-        b = {'name': 'Jeff', 'receiver_name': 'Observer1','timestamp': datetime.datetime(2018, 5, 20, 18, 4, 45), 'field_a': 'WTF', 'field_c': None, 'field_d': 1.4142}
+        b = {'name': 'Jeff', 'receiver_name': 'Observer1', 'timestamp': datetime.datetime(2018, 5, 20, 18, 4, 45), 'field_a': 'WTF', 'field_c': None, 'field_d': 1.4142}
 
         merged = {'name': 'Jeff', 'receiver_name': 'Observer1', 'timestamp': datetime.datetime(2018, 5, 20, 18, 4, 45), 'field_a': 'WTF', 'field_b': 3.141, 'field_d': 1.4142}
 
@@ -83,16 +83,16 @@ class MergerTest(unittest.TestCase):
 
         merger.add_message(b)
         callback.add_message.assert_not_called()
-        
+
         merger.add_message(c)
         callback.add_message.assert_not_called()
-        
+
         merger.add_message(d)
         callback.add_message.assert_not_called()
-        
+
         merger.add_message(e)
         callback.add_message.assert_not_called()
-        
+
         merger.add_message(f)
         callback.add_message.assert_called_once_with(a)
 

tests/gateway/test_process.py

@@ -2,7 +2,7 @@ import datetime
 import unittest
 import unittest.mock as mock
 
-from ogn.gateway.process import process_raw_message, string_to_message
+from ogn.gateway.process import process_raw_message
 
 
 class ProcessManagerTest(unittest.TestCase):

tests/gateway/test_saver.py

@@ -2,7 +2,7 @@ import time
 import unittest
 from unittest.mock import MagicMock
 
-from ogn.gateway.process_tools import DbSaver, FileSaver
+from ogn.gateway.process_tools import DbSaver
 
 
 class DbSaverTest(unittest.TestCase):
@@ -10,7 +10,7 @@ class DbSaverTest(unittest.TestCase):
         a = "Albert"
         b = "Bertram"
         c = "Caspar"
-        
+
         session = MagicMock()
         saver = DbSaver(session=session)
         saver.add_message(a)
@@ -26,7 +26,7 @@ class DbSaverTest(unittest.TestCase):
     def test_timeout(self):
         a = "Xanthippe"
         b = "Yvonne"
-        
+
         session = MagicMock()
         saver = DbSaver(session=session)
         saver.add_message(a)
@@ -36,7 +36,7 @@ class DbSaverTest(unittest.TestCase):
 
         saver.add_message(b)
         session.bulk_save_objects.assert_called_once_with([a, b])
-        
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_utils.py

@@ -2,7 +2,7 @@ import os
 import unittest
 
 from ogn.model import AircraftType
-from ogn.utils import get_ddb, get_trackable, get_country_code, get_airports, haversine
+from ogn.utils import get_ddb, get_trackable, get_country_code, get_airports
 import unittest.mock as mock
 
 
@@ -57,8 +57,3 @@ class TestStringMethods(unittest.TestCase):
     def test_get_airports(self):
         airports = get_airports(os.path.dirname(__file__) + '/SeeYou.cup')
         self.assertGreater(len(airports), 1000)
-    
-    def test_haversine(self):
-        distance,bearing = haversine(45.7597, 4.8422, 48.8567, 2.3508)
-        self.assertAlmostEqual(distance, 392216.7, 0)
-        self.assertAlmostEqual(bearing, 332, 0)