lots a small stuff
This commit is contained in:
@@ -40,7 +40,7 @@ queuehigh = django_rq.get_queue('default')
|
||||
# Sends a confirmation with a link to the workout
|
||||
from rowers.emails import send_template_email
|
||||
|
||||
def send_confirm(user, name, link, options):
|
||||
def send_confirm(user, name, link, options): # pragma: no cover
|
||||
d = {
|
||||
'first_name':user.first_name,
|
||||
'name':name,
|
||||
@@ -65,12 +65,12 @@ def rdata(file, rower=rrower()):
|
||||
""" Reads rowingdata data or returns 0 on Error """
|
||||
try:
|
||||
result = rrdata(csvfile=file, rower=rower)
|
||||
except IOError:
|
||||
except IOError: # pragma: no cover
|
||||
try:
|
||||
result = rrdata(csvfile=file + '.gz', rower=rower)
|
||||
except IOError:
|
||||
result = 0
|
||||
except TypeError:
|
||||
except TypeError: # pragma: no cover
|
||||
try:
|
||||
result = rrdata(csvfile=file)
|
||||
except IOError:
|
||||
@@ -88,18 +88,18 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
workouttype = 'rower'
|
||||
impeller = False
|
||||
|
||||
try:
|
||||
try: # pragma: no cover
|
||||
datafilename = datafile.name
|
||||
fileformat = get_file_type('media/' + datafilename)
|
||||
raise ValueError
|
||||
except IOError:
|
||||
except IOError: # pragma: no cover
|
||||
datafilename = datafile.name + '.gz'
|
||||
fileformat = get_file_type('media/' + datafilename)
|
||||
except AttributeError:
|
||||
datafilename = datafile
|
||||
fileformat = get_file_type('media/' + datafile)
|
||||
|
||||
if len(fileformat) == 3 and fileformat[0] == 'zip':
|
||||
if len(fileformat) == 3 and fileformat[0] == 'zip': # pragma: no cover
|
||||
with zipfile.ZipFile('media/' + datafilename) as zip_file:
|
||||
datafilename = zip_file.extract(
|
||||
zip_file.namelist()[0],
|
||||
@@ -112,7 +112,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
f,e = os.path.splitext(datafilename)
|
||||
if fileformat == 'unknown' and 'txt' not in e:
|
||||
fcopy = "media/"+datafilename
|
||||
if not testing:
|
||||
if not testing: # pragma: no cover
|
||||
if settings.CELERY:
|
||||
res = handle_sendemail_unrecognized.delay(
|
||||
fcopy,
|
||||
@@ -141,7 +141,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
if fileformat != 'csv':
|
||||
filename_mediadir, summary, oarlength, inboard,fileformat,impeller = dataprep.handle_nonpainsled(
|
||||
'media/' + datafilename, fileformat, summary)
|
||||
if not filename_mediadir:
|
||||
if not filename_mediadir: # pragma: no cover
|
||||
return 0
|
||||
else:
|
||||
filename_mediadir = 'media/' + datafilename
|
||||
@@ -149,7 +149,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
oarlength = 2.89
|
||||
|
||||
row = rdata(filename_mediadir)
|
||||
if row == 0:
|
||||
if row == 0: # pragma: no cover
|
||||
return 0
|
||||
|
||||
# change filename
|
||||
@@ -169,7 +169,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
||||
dosummary = dosummary or summary == ''
|
||||
|
||||
if name == '':
|
||||
if name == '': # pragma: no cover
|
||||
name = 'Workout from Background Queue'
|
||||
|
||||
id, message = dataprep.save_workout_database(
|
||||
|
||||
Reference in New Issue
Block a user