From 3050c014b36c4e5ab571ae24a961bbd934f3802d Mon Sep 17 00:00:00 2001
From: Roy de Goei <goei@astron.nl>
Date: Mon, 29 Mar 2021 15:10:22 +0200
Subject: [PATCH] TMSS-687: Timing of build system is slower, change a but but
it is not robust
---
.../test/t_precalculations_service.py | 72 +++++++++----------
1 file changed, 35 insertions(+), 37 deletions(-)
diff --git a/SAS/TMSS/backend/services/precalculations_service/test/t_precalculations_service.py b/SAS/TMSS/backend/services/precalculations_service/test/t_precalculations_service.py
index d055b4aad59..4277cffb3cd 100644
--- a/SAS/TMSS/backend/services/precalculations_service/test/t_precalculations_service.py
+++ b/SAS/TMSS/backend/services/precalculations_service/test/t_precalculations_service.py
@@ -37,7 +37,11 @@ class TestPreCalculationService(unittest.TestCase):
Tests for the TMSSPreCalculationsServiceJob
It will check the number of items created of the StationTimeline model based on the input of the service to start
It will not check the content of the sunrise/sunset data of the StationTimeline model itself
- Note that 1 day calculation will take about 6 seconds
+ Note that 1 day calculation will take about 6 seconds (my local developer environment)
+ So the assumption was that the calculation takes about 6 sec BUT the build environment tooks ever longer, 11
+ a 14 seconds!!!! Some 'timing' parameters where adjusted in this testcase but maybe not robust enough
+ On the other hand if the build system is getting even more slower than this there should be really be a doubt
+ about the build system.
"""
@classmethod
@@ -73,7 +77,7 @@ class TestPreCalculationService(unittest.TestCase):
nbr_stations = len(get_all_stations())
# Initially there should be no data
- self.assertEqual(0, len(StationTimeline.objects.all()))
+ self.assertEqual(len(StationTimeline.objects.all()), 0)
# Now we are going to create and start the calculation service with a wait time of 60 sec,
# nbr days to calculate ahead is 1 and nbr days before today 1 -> so only 'yesterday' should be created
job = create_service_job_for_sunrise_and_sunset_calculations(60, 1, 1)
@@ -81,16 +85,16 @@ class TestPreCalculationService(unittest.TestCase):
job.stop()
# Check what have been created
st_objects = StationTimeline.objects.all()
- self.assertEqual(nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
# lets check with the timestamp of today, that should be zero
st_objects = StationTimeline.objects.filter(timestamp=datetime.date.today())
- self.assertEqual(0, len(st_objects))
+ self.assertEqual(len(st_objects), 0)
# lets check with the timestamp in future, that should be zero
st_objects = StationTimeline.objects.filter(timestamp__gt=datetime.date.today())
- self.assertEqual(0, len(st_objects))
+ self.assertEqual(len(st_objects), 0)
# lets check with the timestamp yesterday, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp=datetime.date.today()-datetime.timedelta(days=1))
- self.assertEqual(nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
def test_all_stations_calculated_for_multiple_days_with_one_trigger(self):
"""
@@ -105,31 +109,31 @@ class TestPreCalculationService(unittest.TestCase):
nbr_stations = len(get_all_stations())
# Initially there should be no data
- self.assertEqual(0, len(StationTimeline.objects.all()))
- # Now we are going to create and start the calculation service with a interval of 60 sec,
+ self.assertEqual(len(StationTimeline.objects.all()), 0)
+ # Now we are going to create and start the calculation service with a interval of 120 sec,
# nbr days to calculate ahead is 4 and nbr days before today 2 -> so 'day before yesterday, 'yesterday',
# 'today' and 'tomorrow' should be created
- job = create_service_job_for_sunrise_and_sunset_calculations(60, 4, 2)
+ job = create_service_job_for_sunrise_and_sunset_calculations(120, 4, 2)
job.start()
job.stop()
# Check what have been created
st_objects = StationTimeline.objects.all()
- self.assertEqual(4*nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), 4*nbr_stations)
# lets check with the timestamp of today, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp=datetime.date.today())
- self.assertEqual(nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
# lets check with the timestamp in future, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp__gt=datetime.date.today())
- self.assertEqual(nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
# lets check with the timestamp in the past, that should be equal to the 2 times number of all stations
st_objects = StationTimeline.objects.filter(timestamp__lt=datetime.date.today())
- self.assertEqual(2*nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), 2*nbr_stations)
- def test_all_stations_calculated_for_multiple_days(self):
+ def test_all_stations_calculated_after_interval(self):
"""
Test if creating and starting, waiting for period (25 seconds), followed by stopping the (pre)calculation service results
in 'multiple day' of StationTimeline data for all stations.
- It will test the scheduler with interval of 10 seconds, so three days should be calculated
+ It will test the scheduler with interval of 20 seconds, so three days should be calculated
"""
# Import here otherwise you get
# "django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings."
@@ -138,34 +142,34 @@ class TestPreCalculationService(unittest.TestCase):
nbr_stations = len(get_all_stations())
# Initially there should be no data
- self.assertEqual(0, len(StationTimeline.objects.all()))
- # Now we are going to create and start the calculation service with a interval of 10 sec (smaller will not make sense),
- # nbr days to calculate ahead is 1 and nbr days before today 0 -> so it start with 'today' and after 10 seconds
+ self.assertEqual(len(StationTimeline.objects.all()), 0)
+ # Now we are going to create and start the calculation service with a interval of 20 sec (smaller will not make sense),
+ # nbr days to calculate ahead is 1 and nbr days before today 0 -> so it start with 'today' and after 20 seconds
# 'tomorrow' etc..,
- job = create_service_job_for_sunrise_and_sunset_calculations(10, 1, 0)
+ job = create_service_job_for_sunrise_and_sunset_calculations(20, 1, 0)
job.start()
time.sleep(25)
job.stop()
- # Check what have been created with interval of 10 seconds we should have three days
+ # Check what have been created with interval of 20 seconds we should have two days
st_objects = StationTimeline.objects.all()
- self.assertEqual(3*nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), 2*nbr_stations)
# lets check with the timestamp of today, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp=datetime.date.today())
- self.assertEqual(nbr_stations, len(st_objects))
- # lets check with the timestamp in future, that should be equal to 2 times the number of all stations
+ self.assertEqual(len(st_objects), nbr_stations)
+ # lets check with the timestamp in future, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp__gt=datetime.date.today())
- self.assertEqual(2*nbr_stations, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
# lets check with the timestamp in the past, that should be equal to zero
st_objects = StationTimeline.objects.filter(timestamp__lt=datetime.date.today())
- self.assertEqual(0, len(st_objects))
+ self.assertEqual(len(st_objects), 0)
def test_all_stations_calculated_for_when_interval_time_is_too_small(self):
"""
Check that if the interval time < calculation time it does not lead to exception
- Test if creating and starting, waiting for period (10 seconds), followed by stopping the (pre)calculation service results
+ Test if creating and starting, waiting for period (20 seconds), followed by stopping the (pre)calculation service results
in 'multiple day' of StationTimeline data for all stations.
It will test the scheduler with interval of 2 seconds, which smaller than ~6 seconds
- Stopping after 10 seconds makes 2 days calculated
+ Stopping after 20 seconds should make 2 days calculated
"""
# Import here otherwise you get
# "django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings."
@@ -174,26 +178,20 @@ class TestPreCalculationService(unittest.TestCase):
nbr_stations = len(get_all_stations())
# Initially there should be no data
- self.assertEqual(0, len(StationTimeline.objects.all()))
+ self.assertEqual(len(StationTimeline.objects.all()), 0)
# Now we are going to create and start the calculation service with an interval of 2 sec
# nbr days to calculate ahead is 1 and nbr days before today 0 -> so it start with 'today' and after ~6 seconds
# 'tomorrow' etc..
job = create_service_job_for_sunrise_and_sunset_calculations(2, 1, 0)
job.start()
- time.sleep(10)
+ time.sleep(20)
job.stop()
# Check what have been created with interval of 2 seconds we should have two days
st_objects = StationTimeline.objects.all()
- self.assertEqual(2 * nbr_stations, len(st_objects))
+ self.assertGreaterEqual(len(st_objects), 2 * nbr_stations)
# lets check with the timestamp of today, that should be equal to the number of all stations
st_objects = StationTimeline.objects.filter(timestamp=datetime.date.today())
- self.assertEqual(nbr_stations, len(st_objects))
- # lets check with the timestamp in future, that should be equal to the number of all stations
- st_objects = StationTimeline.objects.filter(timestamp__gt=datetime.date.today())
- self.assertEqual(nbr_stations, len(st_objects))
- # lets check with the timestamp in the past, that should be equal to zero
- st_objects = StationTimeline.objects.filter(timestamp__lt=datetime.date.today())
- self.assertEqual(0, len(st_objects))
+ self.assertEqual(len(st_objects), nbr_stations)
if __name__ == '__main__':
--
GitLab