passing colin's file

rowers/dataprep.py

@@ -482,7 +482,7 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
 
 
     try:
-        mask = datadf['wash'] > 1
+        mask = datadf['wash'] < 1
         datadf.loc[mask, 'wash'] = np.nan
     except (KeyError,TypeError):
         pass

rowers/tests/test_units.py

@@ -121,6 +121,41 @@ class ForceUnits(TestCase):
         average_N = int(df['averageforce'].mean())
         self.assertEqual(average_N,267)
 
+def test_upload_speedcoach_colin(self):
+    login = self.c.login(username=self.u.username, password=self.password)
+    self.assertTrue(login)
+
+    filename = 'rowers/tests/testdata/colinforce.csv'
+    f = open(filename,'rb')
+    file_data = {'file': f}
+    form_data = {
+    'title':'test',
+    'workouttype':'rower',
+    'boattype':'1x',
+    'notes':'aap noot mies',
+    'make_plot':False,
+    'upload_to_c2':False,
+    'plottype':'timeplot',
+    'file': f,
+    }
+
+    form = DocumentsForm(form_data,file_data)
+    response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+
+    self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
+                         status_code=302,target_status_code=200)
+
+    self.assertEqual(response.status_code, 200)
+
+    f.close()
+
+    w = Workout.objects.get(id=1)
+    self.assertEqual(w.forceunit,'lbs')
+
+    df = dataprep.getsmallrowdata_db(['averageforce'],ids=[1])
+    average_N = int(df['averageforce'].mean())
+    self.assertEqual(average_N,106)
+
 @override_settings(TESTING=True)
 class TestForceUnit(TestCase):
     def setUp(self):