Merge branch 'develop' into feature/opaqueid

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')
@@ -153,10 +153,12 @@ class BoxPlotTest(TestCase):
         options['plotfield'] = 'spm'
         options['rankingonly'] = False
 
-        self.c.session['options'] = options
-        self.c.session.save()
+        session = self.c.session
+        session['options'] = options
+        session.save()
+        response = self.c.get('/')
 
-        sessionoptions = self.c.session['options']
+        sessionoptions = session['options']
         self.assertEqual(sessionoptions['ids'],[1,2,3])
 
         response = self.c.get('/rowers/user-boxplot-data/')
@@ -186,13 +188,15 @@ 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')
     @patch('rowers.dataprep.getsmallrowdata_db')
+    @patch('rowers.dataprep.myqueue')
     def test_list_workouts(self, mocked_sqlalchemy,
-                              mocked_getsmallrowdata_db):
+                           mocked_getsmallrowdata_db,
+                           mocked_myqueue):
 
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
@@ -242,7 +246,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):
@@ -287,7 +291,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)
@@ -322,7 +326,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)
@@ -359,7 +363,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)
@@ -433,8 +437,10 @@ class CumFlexTest(TestCase):
                    'yparam1': u'driveenergy',
                    'yparam2': u'power'}
 
-        self.c.session['options'] = options
-        self.c.session.save()
+        session = self.c.session
+        session['options'] = options
+        session.save()
+        response = self.c.get('/')
         
         url = '/rowers/flexalldata/'
         response = self.c.get(url)
@@ -462,7 +468,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)
@@ -534,8 +540,10 @@ class MultiFlexTest(TestCase):
             'ploterrorbars':False,
         }
 
-        self.c.session['options'] = options
-        self.c.session.save()
+        session = self.c.session
+        session['options'] = options
+        session.save()
+        response = self.c.get('/')
         
         url = '/rowers/user-multiflex-data/'
         response = self.c.get(url)
@@ -562,7 +570,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')
@@ -615,11 +623,12 @@ class HistoTest(TestCase):
             'startdatestring':startdate.strftime("%Y-%m-%d"),
         }
 
-        
-        self.c.session['options'] = options
-        self.c.session.save()
+        session = self.c.session
+        session['options'] = options
+        session.save()
+        response = self.c.get('/')
 
-        sessionoptions = self.c.session['options']
+        sessionoptions = session['options']
 
         response = self.c.get('/rowers/histodata/')
         self.assertEqual(response.status_code,200)