sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

adding OSError for linux

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-08 21:06:15 +01:00
parent 98a4c36631
commit 0545ee6d06
18 changed files with 72590 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dump.rdb Normal file
View File

Binary file not shown.

7
rowers/tests/statements.py
View File

@@ -3,6 +3,11 @@ try:
except NameError: except NameError:
WindowsError = None WindowsError = None
try:
OSError
except NameError:
OSError = None
import pytest import pytest
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
@@ -93,7 +98,7 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
row = rdata(filename) row = rdata(filename)
totaldist = row.df['cum_dist'].max() totaldist = row.df['cum_dist'].max()
totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min() totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)'] totaltime = totaltime+row.df.loc[row.df.index[0],' ElapsedTime (sec)']
hours = int(totaltime/3600.) hours = int(totaltime/3600.)

18
rowers/tests/test_analysis.py
View File

@@ -26,7 +26,7 @@ class WorkoutCompareTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -91,7 +91,7 @@ class BoxPlotTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -188,7 +188,7 @@ class ListWorkoutTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -244,7 +244,7 @@ class PlannedSessionTests(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_ics_download(self): def test_ics_download(self):
@@ -289,7 +289,7 @@ class ForcecurveTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db) @patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db)
@@ -323,7 +323,7 @@ class CumStatsTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats) @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats)
@@ -360,7 +360,7 @@ class CumFlexTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex) @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
@@ -465,7 +465,7 @@ class MultiFlexTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex) @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
@@ -567,7 +567,7 @@ class HistoTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')

2
rowers/tests/test_basicrower.py
View File

@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def start_protrial(self): def start_protrial(self):

19
rowers/tests/test_cpchart.py
View File

@@ -71,13 +71,16 @@ class OTWCPChartTest(TestCase):
pass pass
def tearDown(self): def tearDown(self):
for filename in os.listdir('rowers/tests/testdata/otwcp/temp'): try:
path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename) for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
if not os.path.isdir(path): path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
try: if not os.path.isdir(path):
os.remove(path) try:
except (IOError,WindowsError): os.remove(path)
pass except (IOError,WindowsError,OSError):
pass
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_cpraw) @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_cpraw)
@patch('rowers.dataprep.getcpdata_sql',side_effect=mocked_getcpdata_sql) @patch('rowers.dataprep.getcpdata_sql',side_effect=mocked_getcpdata_sql)
@@ -153,7 +156,7 @@ class CPChartTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_analytics_page(self): def test_analytics_page(self):

6
rowers/tests/test_emails.py
View File

@@ -42,7 +42,7 @@ workout run
if not os.path.isdir(path): if not os.path.isdir(path):
try: try:
os.remove(path) os.remove(path)
except (IOError,WindowsError): except (IOError,WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -131,7 +131,7 @@ race 1
if not os.path.isdir(path): if not os.path.isdir(path):
try: try:
os.remove(path) os.remove(path)
except (IOError,WindowsError): except (IOError,WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -191,7 +191,7 @@ race 1
if not os.path.isdir(path): if not os.path.isdir(path):
try: try:
os.remove(path) os.remove(path)
except (IOError,WindowsError): except (IOError,WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')

2
rowers/tests/test_imports.py
View File

@@ -777,7 +777,7 @@ boattype: 2x
if not os.path.isdir(path): if not os.path.isdir(path):
try: try:
os.remove(path) os.remove(path)
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.tpstuff.requests.post', side_effect=mocked_requests) @patch('rowers.tpstuff.requests.post', side_effect=mocked_requests)

12
rowers/tests/test_plans.py
View File

@@ -26,7 +26,7 @@ class TrainingPlanTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_createplan(self): def test_createplan(self):
@@ -209,7 +209,7 @@ class SessionLinkTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_plannedsessions(self): def test_plannedsessions(self):
@@ -437,7 +437,7 @@ class SessionCompleteTest(TestCase):
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.w1.csvfilename) os.remove(self.w1.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_session1_complete(self): def test_session1_complete(self):
@@ -672,7 +672,7 @@ class ChallengeCompleteTest(TestCase):
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.w1.csvfilename) os.remove(self.w1.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_challenge1_complete(self): def test_challenge1_complete(self):
@@ -895,7 +895,7 @@ class MandatoryTestCompleteTest(TestCase):
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.w1.csvfilename) os.remove(self.w1.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_mandatorytest1_complete(self): def test_mandatorytest1_complete(self):
@@ -1216,7 +1216,7 @@ class PlannedSessionsView(TestCase):
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.w1.csvfilename) os.remove(self.w1.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_clone_view(self): def test_clone_view(self):

2
rowers/tests/test_rowerplans.py
View File

@@ -24,7 +24,7 @@ class TrialsTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_basictrial(self): def test_basictrial(self):

2
rowers/tests/test_simplefunctions.py
View File

@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts: for workout in self.user_workouts:
try: try:
os.remove(workout.csvfilename) os.remove(workout.csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass

42
rowers/tests/test_staticcharts.py
View File

@@ -67,7 +67,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 1 plotnr = 1
@@ -80,7 +80,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 2 plotnr = 2
@@ -93,7 +93,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 3 plotnr = 3
@@ -106,7 +106,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 4 plotnr = 4
@@ -119,7 +119,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 5 plotnr = 5
@@ -132,7 +132,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 6 plotnr = 6
@@ -145,7 +145,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 7 plotnr = 7
@@ -158,7 +158,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 8 plotnr = 8
@@ -171,7 +171,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 13 plotnr = 13
@@ -184,7 +184,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.tasks.rdata') @patch('rowers.tasks.rdata')
@@ -206,7 +206,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 1 plotnr = 1
@@ -219,7 +219,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 2 plotnr = 2
@@ -232,7 +232,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 3 plotnr = 3
@@ -245,7 +245,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 4 plotnr = 4
@@ -258,7 +258,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 5 plotnr = 5
@@ -271,7 +271,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 6 plotnr = 6
@@ -284,7 +284,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 7 plotnr = 7
@@ -297,7 +297,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 8 plotnr = 8
@@ -310,7 +310,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 9 plotnr = 9
@@ -323,7 +323,7 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass
plotnr = 13 plotnr = 13
@@ -336,5 +336,5 @@ class PlotTests(TestCase):
filename=fullpathimagename) filename=fullpathimagename)
try: try:
os.remove(fullpathimagename) os.remove(fullpathimagename)
except WindowsError: except (WindowsError,OSError):
pass pass

4
rowers/tests/test_team.py
View File

@@ -80,7 +80,7 @@ class TeamTest(TestCase):
for csvfilename in self.csvfilenames: for csvfilename in self.csvfilenames:
try: try:
os.remove(csvfilename) os.remove(csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_manager_drop_member(self): def test_manager_drop_member(self):
@@ -288,7 +288,7 @@ class TeamTestLowLevel(TestCase):
for csvfilename in self.csvfilenames: for csvfilename in self.csvfilenames:
try: try:
os.remove(csvfilename) os.remove(csvfilename)
except (IOError, WindowsError): except (IOError, WindowsError,OSError):
pass pass
def test_lowlevel_update_team(self): def test_lowlevel_update_team(self):

36
rowers/tests/test_uploads.py
View File

@@ -105,7 +105,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -163,7 +163,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -201,7 +201,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -283,7 +283,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -320,7 +320,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -357,7 +357,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -396,7 +396,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -432,7 +432,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -469,7 +469,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -508,7 +508,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -543,7 +543,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -576,7 +576,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -609,7 +609,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -642,7 +642,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@@ -676,7 +676,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -708,7 +708,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -740,7 +740,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass
@patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.create_engine')
@@ -772,6 +772,6 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename
try: try:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
except WindowsError: except (WindowsError,OSError):
pass pass

72497
rowers/tests/testdata/rowinginmotionexample.tcx vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

2
rowers/urls.py
View File

@@ -257,7 +257,7 @@ urlpatterns = [
url(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'), url(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'),
url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'), url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),
url(r'^workout/(?P<id>\d+)/histo/$',views.workout_histo_view,name='workout_histo_view'), url(r'^workout/(?P<id>\d+)/histo/$',views.workout_histo_view,name='workout_histo_view'),
url(r'^workout/(?P<id>\d+)/task/$',views.workout_test_task_view), # url(r'^workout/(?P<id>\d+)/task/$',views.workout_test_task_view),
url(r'^workout/(?P<id>\d+)/forcecurve/$',views.workout_forcecurve_view,name='workout_forcecurve_view'), url(r'^workout/(?P<id>\d+)/forcecurve/$',views.workout_forcecurve_view,name='workout_forcecurve_view'),
url(r'^workout/(?P<id>\d+)/unsubscribe/$',views.workout_unsubscribe_view,name='workout_unsubscribe_view'), url(r'^workout/(?P<id>\d+)/unsubscribe/$',views.workout_unsubscribe_view,name='workout_unsubscribe_view'),
# url(r'^workout/(?P<id>\d+)/export/$',views.workout_export_view), # url(r'^workout/(?P<id>\d+)/export/$',views.workout_export_view),

2
rowers/views/statements.py
View File

@@ -146,7 +146,7 @@ from rowsandall_app.settings import (
PAYMENT_PROCESSING_ON PAYMENT_PROCESSING_ON
) )
from rowers.tasks_standalone import addcomment2 #from rowers.tasks_standalone import addcomment2
from django.contrib import messages from django.contrib import messages
from async_messages import messages as a_messages from async_messages import messages as a_messages

22
rowers/views/workoutviews.py
View File

@@ -67,17 +67,17 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
}) })
# Test asynchronous tasking and messaging # Test asynchronous tasking and messaging
@login_required() #@login_required()
def workout_test_task_view(request,id=0): #def workout_test_task_view(request,id=0):
row = Workout.objects.get(id=id) # row = Workout.objects.get(id=id)
res = myqueue(queuehigh,addcomment2,request.user.id,row.id) # res = myqueue(queuehigh,addcomment2,request.user.id,row.id)#
#
#
url = reverse('workout_edit_view', # url = reverse('workout_edit_view',
kwargs = { # kwargs = {
'id':int(id), # 'id':int(id),
}) # })
return HttpResponseRedirect(url) # return HttpResponseRedirect(url)
# Show Stroke power histogram for a workout # Show Stroke power histogram for a workout
@login_required() @login_required()