From f83e010fb135b660cba3bb1cd4954e38dcc6f9a2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 9 Apr 2021 17:39:31 +0200 Subject: [PATCH] coverage optimizations --- rowers/tests/test_races.py | 2 ++ rowers/views/workoutviews.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/rowers/tests/test_races.py b/rowers/tests/test_races.py index 2f1a3114..fe78d0d9 100644 --- a/rowers/tests/test_races.py +++ b/rowers/tests/test_races.py @@ -15,6 +15,8 @@ import rowers.tasks as tasks from rowers.views.racesviews import * from rowers.utils import calculate_age +# to do - add test for manual form with image + @override_settings(TESTING=True) class ChallengesTest(TestCase): def setUp(self): diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index ff582f27..c26b1ac7 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -871,7 +871,7 @@ def workouts_join_view(request,userid=0): setprivate=set_private, killparents=killparents) - if message: + if message: # pragma: no cover messages.error(request,message) url = reverse(r.defaultlandingpage, @@ -920,13 +920,13 @@ def video_selectworkout(request,userid=0,teamid=0): options['userid'] = userid try: workouttypes = options['workouttypes'] - except KeyError: + except KeyError: # pragma: no cover workouttypes = ['rower','dynamic','slides'] try: modalities = options['modalities'] modality = modalities[0] - except KeyError: + except KeyError: # pragma: no cover modalities = [m[0] for m in mytypes.workouttypes_ordered.items()] modality = 'all' @@ -934,11 +934,11 @@ def video_selectworkout(request,userid=0,teamid=0): try: rankingonly = options['rankingonly'] - except KeyError: + except KeyError: # pragma: no cover rankingonly = False query = request.GET.get('q') - if query: + if query: # pragma: no cover query_list = query.split() workouts = workouts.filter( reduce(operator.and_, @@ -1005,7 +1005,7 @@ def video_selectworkout(request,userid=0,teamid=0): startdate = datetime.datetime.combine(startdate,datetime.time()) enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) - if enddate < startdate: + if enddate < startdate: # pragma: no cover s = enddate enddate = startdate startdate = s @@ -1168,7 +1168,7 @@ def workouts_join_select(request, if enddatestring: enddate = iso8601.parse_date(enddatestring) - if enddate < startdate: + if enddate < startdate: # pragma: no cover s = enddate enddate = startdate startdate = s @@ -1279,7 +1279,7 @@ def remove_power_view(request,id=0): try: os.remove('media/cpdata_{id}.parquet.gz'.format(id=workout.id)) - except OSError: + except OSError: # pragma: no cover pass f = workout.csvfilename @@ -1412,7 +1412,7 @@ def team_comparison_select(request, if enddatestring: enddate = iso8601.parse_date(enddatestring) - if enddate < startdate: + if enddate < startdate: # pragma: no cover s = enddate enddate = startdate startdate = s @@ -1445,7 +1445,7 @@ def team_comparison_select(request, workouts = workouts.exclude(rankingpiece=False) query = request.GET.get('q') - if query: + if query: # pragma: no cover query_list = query.split() workouts = workouts.filter( reduce(operator.and_, @@ -2034,7 +2034,7 @@ def workouts_view(request,message='',successmessage='', #enddate = enddate+datetime.timedelta(days=1) - if enddate < startdate: + if enddate < startdate: # pragma: no cover s = enddate enddate = startdate startdate = s