From 8205fd3c3fc497dc9f21fb7f3408329b91b2c6e7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 15 Sep 2021 10:10:48 +0200 Subject: [PATCH] coverage changes --- rowers/c2stuff.py | 11 +++++++++-- rowers/dataprep.py | 2 +- rowers/interactiveplots.py | 4 ++-- rowers/management/commands/processemail.py | 2 +- rowers/models.py | 2 +- rowers/plannedsessions.py | 2 +- rowers/sporttracksstuff.py | 2 +- rowers/tasks.py | 6 +++--- rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 0 bytes rowers/views/importviews.py | 8 ++++---- rowers/views/planviews.py | 2 +- rowers/views/workoutviews.py | 4 ++-- 12 files changed, 26 insertions(+), 19 deletions(-) delete mode 100644 rowers/tests/testdata/testdata.tcx.gz diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index a041ec3a..35e3518f 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -631,8 +631,15 @@ def createc2workoutdata(w): spmav = int(row.df[' Cadence (stokes/min)'][mask].mean().astype(int)) hrav = int(row.df[' HRCur (bpm)'][mask].mean().astype(int)) except AttributeError: # pragma: no cover - spmav = int(row.df[' Cadence (stokes/min)'][mask].mean()) - hrav = int(row.df[' HRCur (bpm)'][mask].mean()) + try: + spmav = int(row.df[' Cadence (stokes/min)'][mask].mean()) + hrav = int(row.df[' HRCur (bpm)'][mask].mean()) + except ValuError: + smpav = 0 + try: + hrav = int(row.df[' HRCur (bpm)'][mask].mean()) + except ValuError: + hrav = 0 intervaldict = { 'type': 'distance', 'time': int(10*itime[i]), diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6979bf0a..cd7f6c84 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2544,7 +2544,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput try: df = pd.concat(data,axis=0) - except ValueError: + except ValueError: # pragma: no cover return pd.DataFrame() # df = dd.concat(data,axis=0) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index fd46f0bd..09bac286 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2153,7 +2153,7 @@ def interactive_histoall(theworkouts,histoparam,includereststrokes, # throw out nans histopwr = histopwr[~np.isinf(histopwr)] - if histoparam == 'catch': + if histoparam == 'catch': # pragma: no cover histopwr = histopwr[histopwr < yaxminima[histoparam]] histopwr = histopwr[histopwr > yaxmaxima[histoparam]] else: @@ -6871,7 +6871,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_ df.sort_values('date_sorting',inplace=True) df.drop('date_sorting',inplace=True,axis='columns') df['totaltime'] = 0 - if df.empty: + if df.empty: # pragma: no cover return '','No Data Found' if yaxis == 'percentage': diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 1eb0c384..b091a19e 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -309,7 +309,7 @@ class Command(BaseCommand): # Strava rowers = Rower.objects.filter(strava_auto_import=True) for r in rowers: - if user_is_not_basic(r.user): + if user_is_not_basic(r.user): # pragma: no cover stravastuff.get_strava_workouts(r) self.stdout.write(self.style.SUCCESS( diff --git a/rowers/models.py b/rowers/models.py index e80878c2..02ca4200 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3235,7 +3235,7 @@ class Workout(models.Model): raise forms.ValidationError("Free Coach User cannot have any workouts") if self.timezone == 'tzutc()': - self.timezone = 'UTC' + self.timezone = 'UTC' # pragma: no cover super(Workout, self).save(*args, **kwargs) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 2e8eb896..dbbee2fb 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -380,7 +380,7 @@ def get_todays_micro(plan,thedate=timezone.now()): if thismicro: thismicro = thismicro[0] - else: + else: # pragma: no cover mms = TrainingMicroCycle.objects.all() return None diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py index 795d6067..b8824a62 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -159,7 +159,7 @@ def createsporttracksworkoutdata(w): t = row.df.loc[:,'TimeStamp (sec)'].values-row.df.loc[:,'TimeStamp (sec)'].iloc[0] try: t[0] = t[1] - except IndexError: + except IndexError: # pragma: no cover return 0 d = row.df.loc[:,'cum_dist'].values diff --git a/rowers/tasks.py b/rowers/tasks.py index 007aff46..8ee8d0e2 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -335,11 +335,11 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip failed = True except stravalib.exc.ObjectNotFound: # pragma: no cover failed = True - except IndexError: + except IndexError: # pragma: no cover failed = True except ActivityUploadFailed: # pragma: no cover failed = True - except FileNotFoundError: + except FileNotFoundError: # pragma: no cover failed = True if not failed: @@ -3399,7 +3399,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu try: workoutsummary = requests.get(url,headers=headers).json() - except: + except: # pragma: no cover return 0 diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz deleted file mode 100644 index 9323be28a2c0004be72da43dbdfc58fa19adf529..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4001 zcmV;S4_@#eiwFo7|3F~^|8!+@bYx+4VJ>uIcmVC4NpBoC7J%>m6@m`QVG#CP__!#t z0>{o^4A`C^F*3OgDpE)88L1_x%iF&nvfGhmTZQCFQv|C(9}IPMZCzhI^6fnQ?%ny> z-kassW_7WCxQ_<*_r5!NaQO17Tdh~?)5ptozr1?V_1$mXX1SMkUT+@mzv}zTgT>n~ST{1p(mV*XPfE-k#!{)q2x+>*HlQYO^}no%h+rao2Bu?VWC5Pk+=K zGVeAge}3TKyZ&)^c5$^@ZWeFw&-eem>yLN)FRw3!f9+C(fbM$e?l_ww1sk9+@t?+7s*F0Ma)+~H9YweEEJk7c_1pSphe{pI=g)$HG2reAWs z`RV%mW!GOWukG5~cGLgOBa`Qo+EYkx%BFv9*_xBBoSF6+0bZg80)y2ut z^KSjRJ4+Nl*?M#D?)bl--2HaT<;7~<-`t$PNbkU3co(<3eR||)uY?#o{F-bJxF>;| z6v%%;VMpS21fM)$xaIk7ceozCHeX!!<&VGq<(c5tG5qs0rgQ$Q>-!`&@o=&G>+@?a z(nUZ2dAHwUei3fNtEJ9hlC+CeP)9a64ea?rSHzuMMcfla1Q!(CDd|lGxre)Rr@G|b zN=4kAAx70GpN0r7$UV-6yR#K>k4fIGcn$YhQr;P6!`)ZJ-O_fPcM9${7%Ipe@4+3b z;vS$P?vl7Cq0(sc-nfZyuS?zoSH#_$;K6D1dFM)+aZK~!?(5+$V0=KUk#{dfCc?e4 zalRruPS`}SQNuk*N&9_H@*XPU?u-Khjb0a}s6Ia*c}J*7v6E<+b#7XOvgG+53jEfjmZ zHS;{#vgGZI$X67x;a~v3i-x>F$>_YjkKdk~RX0RF$**;&O2ZDdBl$Rkchw{KC}Ve-y+!JvuKGGS4Beoo{ovgfmf##S}YGoy(UA&+gI zznwhi+*<}DjVC9)C?&J5t!sY!QOJt{hM zIOpCvkEj{#1z|EW-|YEe^3hO$7*ynA)9t4pu@TDMQdCh|VQ9Mj^krVG2}!qC$-FI_ zbsbwR?I`5E5!OX)M9PwHKD-gg+XUO7x2mjbagF?4$=iy^lL=l|T_qkT6Q6G~KTKYX zB~(>cNhn)a*Lq-%Lp~TnRCP{}ShmK-H{E^=@(3m(vBrDr09)?u^kp8|NFdTgX&p|7 zJU36yAbFRwu2r279br-3eoo|T8ttP2#Gr}KJEo#l)V{^%#~`0`ZvzHR-&<#?XzuNt z$X8^~lQra!Rr9>iWO8r0)z1%-_XaJJYP5G$)SjOac}EqI&z%#9HT~_K=c4ocoXA(C z+b3;}BdS&{bAelwb_V3d0Enu~xr^MQw9_B$*&7jECqxg8{9Vacq}y9C>_z3t@n}nG zc=yV~YZ~4#dCuKWRo+{lEWy|^Fegu5jJFOou{xi0gMzU-!5P`}6~*UmFcuj#IXOPP zEp{U0YxCiSddLgrT3Xeb7G8?h&(BHbYtrz9jTb_V56?SS(r-VjdA=fhKFKdfQq|aa z?^;FW9m!V|rIl!a2~?wfaFfyPoA-8ryc_@;uk_*hSacQgS;@RqMBW+;qLTRlMc1O9 zmCU<}$a{l8pt0%#hRMi$BR@<&8kYup&1fGe6t(B)G}?!H$RinRF>11|1IH%wcO)Mx zA}D!!86pn>)pWB%dvJSnoMQuB2bNwjjt+9eCA1;EICiQnjPZgo}xkZ*o z75d;NBlVS`XIBsUWT)9cU{&a&FRJFvX~4&d&~uvW2~=}ELYNHt+6MfZq}~|@B-LDx zShn0|PUyKJ^f7DrQ783fS1oMl$3dSvp*mJ&W?`DKnub3E^pXdBRmc`msA#l)PHJ97 z#vKPk9)n85N7uZ0cQx)pJ?PWe4KDY`)1dc7`{3RyBNLi&H;CRE0Aiig2Rj+`*o?bD z^gf~2HPOh~Tt(4yLq7`oXrfiRbO>BgCEqW^3 zDs4_u4;7&gMub!iu#u8Q=o|WJyL5c+jA@;S%DAJXAjm}8=U`iweh|Gi>~-yP^1>LC z>73N;`eF3mP>`S-@I4eQtjDJ2je#DM04odbkOEGoBQCbI%t7>Q(CNBnA;qE#m(FUy zr;5-!1D13dxePp+HE!BmKa4(@D9Y*^MqAXS)8_h7&=Z8L43T{-+Bl7xT|Wx?Xegr9Y51XR_=cM|Zw&O7a{nxyH;-d%YTon* zd@BY-S$Jg;CKIo(Eg8F_psh_B8&Zra^h9m0pFVm46O{`Wqh%@@xobZBanQ4g4oQdJ z@?@4bYmVGu^xKw+UZv()vCXA3eMj!LWg>drT<>Hu30f^Ja{ztVwoC-wk~e6*G~;gS zc74b#6RilU9Jw~M>YKZw4;7&gxr3IjtA>qb!#CUp{4vlY8fI}SsTU}_Ts_Z7&4Y^2 z+ihzFm6|7o+bGSczTQ@Z-W#&Ypsg?z_2$_&;E#cxz#uWQ3cZENtZmr5dBf z*C&gh6Rs-t5q0Pt6*cZ!SB-Jdhb;A8H{g4ojMTRQe-J&R3BtN~y#!lS!*4;` zanM`i5K+}tL!xcoyy-h~*&EMfRY6+^ZZfGFP0brbpX@a2P?x3S(6s@7>bZFdJsY9y zq|u6Bo!HcG?jow1M;Ej8#lv;lwmj$9iPdLmWfm9ud&m9{NQXAr%RVXY6}IcRhJ z4A6@q(yDnLT1M{F3$H?MnTTnd4t>DMG*oG7-T?ZTTP6Zx)YIn*BrT1cj?63G7+?E z+IsINGuKlK+76=6Mb-?e@Qn|?+4VC(AB`mIPAB!zPsXmNrsfTyXEI`~E_@RpG`oHV z=p`3kfet+uMW2@nY6JcV=z{@9T|fMgllLcro|-pr2z_438ZhY4bDRwNwtoFEdNx5w z7r9F>N=XerccN(MM?mk4XB$;6o#3#fOJ`Q-r6Tk(uW1W9srOiP!1t{LV+`~{##s!i zES(UFR@&YReXF?}MlZSgCa5xULo8Zpd#?e%_0kzeAM%>Ey2xFGqKlo)O2e-uOGjY4 zk~N@LIdUV)WL!GX`sNLy->zh>TjwrP*`O`7xqcM%K3Cr;(X*e->XvP;A4H#5vSuWe zH!oUWwEBix-@H-K^L7z)m2np(w$&{s?#;{ST`s&*qIa>V)VD^dChVw=fjrg-G9<0v$Npl=P!3# ztNANSjCxPG*so&WG(-}FpB(-0BD2~4x!e9@ zdW&DYKL2f*?hN1?fZhLxiyL3;p8WPP9X;5hUaiw}c$`o!ub!l*@msp|(S!d1CQzC? H#DD<+s?0IQ diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 2c133ac0..5dad8ce9 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -865,7 +865,7 @@ def workout_rp3import_view(request,userid=0): try: rp3ids = workouts_list['id'].values - except KeyError: + except KeyError: # pragma: no cover rp3ids = [] knownrp3ids = uniqify([ @@ -879,7 +879,7 @@ def workout_rp3import_view(request,userid=0): for key,data in workouts_list.iterrows(): try: i = data['id'] - except KeyError: + except KeyError: # pragma: no cover i = 0 if i in knownrp3ids: # pragma: no cover nnn = '' @@ -888,7 +888,7 @@ def workout_rp3import_view(request,userid=0): try: s = data['executed_at'] - except KeyError: + except KeyError: # pragma: no cover s = '' keys = ['id','starttime','new'] @@ -1003,7 +1003,7 @@ def workout_stravaimport_view(request,message="",userid=0): workouts.append(res2) if request.method == "POST": - try: + try: # pragma: no cover tdict = dict(request.POST.lists()) ids = tdict['workoutid'] stravaids = [int(id) for id in ids] diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index b537dd74..de955a94 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -842,7 +842,7 @@ def plannedsession_multicreate_view(request, if request.method == "POST": ps_formset = PlannedSessionFormSet(queryset = qset, data = request.POST) - if ps_formset.is_valid(): + if ps_formset.is_valid(): # pragma: no cover instances = ps_formset.save(commit=False) for ps in instances: ps.save() diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 569fffec..3eb15010 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -3504,7 +3504,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""): if not np.isnan(hrdrift): try: hrdrift = int(100*hrdrift)/100. - except: + except: # pragma: no cover hrdrift = 0 otherstats['hrdrift'] = { 'verbose_name': 'Heart Rate Drift', @@ -6177,7 +6177,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" timeprev = int(df['time'].values[0]) timenext = int(df['time'].values[result[0]]) s = '{delta}sec'.format(delta=timenext-timeprev) - except IndexError: + except IndexError: # pragma: no cover s = '0sec'