diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 00000000..a81465c0
Binary files /dev/null and b/dump.rdb differ
diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py
index 91f629c5..cbe86df4 100644
--- a/rowers/tests/statements.py
+++ b/rowers/tests/statements.py
@@ -3,6 +3,11 @@ try:
except NameError:
WindowsError = None
+try:
+ OSError
+except NameError:
+ OSError = None
+
import pytest
pytestmark = pytest.mark.django_db
@@ -93,7 +98,7 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
row = rdata(filename)
totaldist = row.df['cum_dist'].max()
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.)
diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py
index 161c7d9c..befeb69a 100644
--- a/rowers/tests/test_analysis.py
+++ b/rowers/tests/test_analysis.py
@@ -26,7 +26,7 @@ class WorkoutCompareTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -91,7 +91,7 @@ class BoxPlotTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -188,7 +188,7 @@ class ListWorkoutTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -244,7 +244,7 @@ class PlannedSessionTests(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_ics_download(self):
@@ -289,7 +289,7 @@ class ForcecurveTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db)
@@ -323,7 +323,7 @@ class CumStatsTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@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:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@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:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@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:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
diff --git a/rowers/tests/test_basicrower.py b/rowers/tests/test_basicrower.py
index 5aed0f37..b7ce543d 100644
--- a/rowers/tests/test_basicrower.py
+++ b/rowers/tests/test_basicrower.py
@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def start_protrial(self):
diff --git a/rowers/tests/test_cpchart.py b/rowers/tests/test_cpchart.py
index 8aded64d..ffcf245f 100644
--- a/rowers/tests/test_cpchart.py
+++ b/rowers/tests/test_cpchart.py
@@ -71,13 +71,16 @@ class OTWCPChartTest(TestCase):
pass
def tearDown(self):
- for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
- path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
- if not os.path.isdir(path):
- try:
- os.remove(path)
- except (IOError,WindowsError):
- pass
+ try:
+ for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
+ path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
+ if not os.path.isdir(path):
+ try:
+ os.remove(path)
+ except (IOError,WindowsError,OSError):
+ pass
+ except (IOError,WindowsError,OSError):
+ pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_cpraw)
@patch('rowers.dataprep.getcpdata_sql',side_effect=mocked_getcpdata_sql)
@@ -153,7 +156,7 @@ class CPChartTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_analytics_page(self):
diff --git a/rowers/tests/test_emails.py b/rowers/tests/test_emails.py
index bf3e986c..fe17f841 100644
--- a/rowers/tests/test_emails.py
+++ b/rowers/tests/test_emails.py
@@ -42,7 +42,7 @@ workout run
if not os.path.isdir(path):
try:
os.remove(path)
- except (IOError,WindowsError):
+ except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -131,7 +131,7 @@ race 1
if not os.path.isdir(path):
try:
os.remove(path)
- except (IOError,WindowsError):
+ except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -191,7 +191,7 @@ race 1
if not os.path.isdir(path):
try:
os.remove(path)
- except (IOError,WindowsError):
+ except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py
index 3db4e2e8..360fc231 100644
--- a/rowers/tests/test_imports.py
+++ b/rowers/tests/test_imports.py
@@ -777,7 +777,7 @@ boattype: 2x
if not os.path.isdir(path):
try:
os.remove(path)
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.tpstuff.requests.post', side_effect=mocked_requests)
diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py
index df4aac67..db832a4f 100644
--- a/rowers/tests/test_plans.py
+++ b/rowers/tests/test_plans.py
@@ -26,7 +26,7 @@ class TrainingPlanTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_createplan(self):
@@ -209,7 +209,7 @@ class SessionLinkTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_plannedsessions(self):
@@ -437,7 +437,7 @@ class SessionCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_session1_complete(self):
@@ -672,7 +672,7 @@ class ChallengeCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_challenge1_complete(self):
@@ -895,7 +895,7 @@ class MandatoryTestCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_mandatorytest1_complete(self):
@@ -1216,7 +1216,7 @@ class PlannedSessionsView(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_clone_view(self):
diff --git a/rowers/tests/test_rowerplans.py b/rowers/tests/test_rowerplans.py
index e9be5c6d..df976bee 100644
--- a/rowers/tests/test_rowerplans.py
+++ b/rowers/tests/test_rowerplans.py
@@ -24,7 +24,7 @@ class TrialsTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_basictrial(self):
diff --git a/rowers/tests/test_simplefunctions.py b/rowers/tests/test_simplefunctions.py
index 92722d57..d9250fec 100644
--- a/rowers/tests/test_simplefunctions.py
+++ b/rowers/tests/test_simplefunctions.py
@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
diff --git a/rowers/tests/test_staticcharts.py b/rowers/tests/test_staticcharts.py
index c7bae989..3e0c5590 100644
--- a/rowers/tests/test_staticcharts.py
+++ b/rowers/tests/test_staticcharts.py
@@ -67,7 +67,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 1
@@ -80,7 +80,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 2
@@ -93,7 +93,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 3
@@ -106,7 +106,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 4
@@ -119,7 +119,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 5
@@ -132,7 +132,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 6
@@ -145,7 +145,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 7
@@ -158,7 +158,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 8
@@ -171,7 +171,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 13
@@ -184,7 +184,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.tasks.rdata')
@@ -206,7 +206,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 1
@@ -219,7 +219,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 2
@@ -232,7 +232,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 3
@@ -245,7 +245,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 4
@@ -258,7 +258,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 5
@@ -271,7 +271,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 6
@@ -284,7 +284,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 7
@@ -297,7 +297,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 8
@@ -310,7 +310,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 9
@@ -323,7 +323,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
plotnr = 13
@@ -336,5 +336,5 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
- except WindowsError:
+ except (WindowsError,OSError):
pass
diff --git a/rowers/tests/test_team.py b/rowers/tests/test_team.py
index 161d5325..93667f8a 100644
--- a/rowers/tests/test_team.py
+++ b/rowers/tests/test_team.py
@@ -80,7 +80,7 @@ class TeamTest(TestCase):
for csvfilename in self.csvfilenames:
try:
os.remove(csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_manager_drop_member(self):
@@ -288,7 +288,7 @@ class TeamTestLowLevel(TestCase):
for csvfilename in self.csvfilenames:
try:
os.remove(csvfilename)
- except (IOError, WindowsError):
+ except (IOError, WindowsError,OSError):
pass
def test_lowlevel_update_team(self):
diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py
index 6e49c425..30a06913 100644
--- a/rowers/tests/test_uploads.py
+++ b/rowers/tests/test_uploads.py
@@ -105,7 +105,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -163,7 +163,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -201,7 +201,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -283,7 +283,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -320,7 +320,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -357,7 +357,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -396,7 +396,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -432,7 +432,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -469,7 +469,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -508,7 +508,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -543,7 +543,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -576,7 +576,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -609,7 +609,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -642,7 +642,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@@ -676,7 +676,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -708,7 +708,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -740,7 +740,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -772,6 +772,6 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
- except WindowsError:
+ except (WindowsError,OSError):
pass
diff --git a/rowers/tests/testdata/rowinginmotionexample.tcx b/rowers/tests/testdata/rowinginmotionexample.tcx
new file mode 100644
index 00000000..b620922c
--- /dev/null
+++ b/rowers/tests/testdata/rowinginmotionexample.tcx
@@ -0,0 +1,72497 @@
+
+
+
+
+ 2015-10-17T08:45:54
+
+ 6406.44
+ 13368.8544921875
+ 0
+ Active
+ 21
+ Manual
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index b02c5979..25b750b2 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/urls.py b/rowers/urls.py
index 22301796..9d58fe3d 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -257,7 +257,7 @@ urlpatterns = [
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/(?P\d+)/histo/$',views.workout_histo_view,name='workout_histo_view'),
- url(r'^workout/(?P\d+)/task/$',views.workout_test_task_view),
+# url(r'^workout/(?P\d+)/task/$',views.workout_test_task_view),
url(r'^workout/(?P\d+)/forcecurve/$',views.workout_forcecurve_view,name='workout_forcecurve_view'),
url(r'^workout/(?P\d+)/unsubscribe/$',views.workout_unsubscribe_view,name='workout_unsubscribe_view'),
# url(r'^workout/(?P\d+)/export/$',views.workout_export_view),
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 6b3cddeb..df6e2f3d 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -146,7 +146,7 @@ from rowsandall_app.settings import (
PAYMENT_PROCESSING_ON
)
-from rowers.tasks_standalone import addcomment2
+#from rowers.tasks_standalone import addcomment2
from django.contrib import messages
from async_messages import messages as a_messages
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index a3d235c8..d722504a 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -67,17 +67,17 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
})
# Test asynchronous tasking and messaging
-@login_required()
-def workout_test_task_view(request,id=0):
- row = Workout.objects.get(id=id)
- res = myqueue(queuehigh,addcomment2,request.user.id,row.id)
-
-
- url = reverse('workout_edit_view',
- kwargs = {
- 'id':int(id),
- })
- return HttpResponseRedirect(url)
+#@login_required()
+#def workout_test_task_view(request,id=0):
+# row = Workout.objects.get(id=id)
+# res = myqueue(queuehigh,addcomment2,request.user.id,row.id)#
+#
+#
+# url = reverse('workout_edit_view',
+# kwargs = {
+# 'id':int(id),
+# })
+# return HttpResponseRedirect(url)
# Show Stroke power histogram for a workout
@login_required()