fixing tests

rowers/c2stuff.py

@@ -684,9 +684,12 @@ def process_callback(request):
 # Uploading workout
 def workout_c2_upload(user,w):
     message = 'trying C2 upload'
-    if mytypes.c2mapping[w.workouttype] is None:
+    try:
+        if mytypes.c2mapping[w.workouttype] is None:
+            return "This workout type cannot be uploaded to Concept2",0
+    except KeyError:
         return "This workout type cannot be uploaded to Concept2",0
-        
+    
     thetoken = c2_open(user)
 
     r = Rower.objects.get(user=user)

rowers/tests.py

@@ -412,7 +412,7 @@ class C2Objects(DjangoTestCase):
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
 	self.w = Workout.objects.create(
-            name='testworkout',workouttype='On-water',
+            name='testworkout',workouttype='water',
 	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
 	    starttime=workoutstarttime,
             startdatetime=row.rowdatetime,
@@ -583,7 +583,7 @@ class STObjects(DjangoTestCase):
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
 	self.w = Workout.objects.create(
-            name='testworkout',workouttype='On-water',
+            name='testworkout',workouttype='water',
 	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
 	    starttime=workoutstarttime,
             startdatetime=row.rowdatetime,
@@ -699,7 +699,7 @@ class RunKeeperObjects(DjangoTestCase):
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
 	self.w = Workout.objects.create(
-            name='testworkout',workouttype='On-water',
+            name='testworkout',workouttype='water',
 	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
 	    starttime=workoutstarttime,
             startdatetime=row.rowdatetime,
@@ -791,7 +791,7 @@ class UAObjects(DjangoTestCase):
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
 	self.w = Workout.objects.create(
-            name='testworkout',workouttype='On-water',
+            name='testworkout',workouttype='water',
 	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
 	    starttime=workoutstarttime,
             startdatetime=row.rowdatetime,
@@ -891,7 +891,7 @@ class TPObjects(DjangoTestCase):
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
 	self.w = Workout.objects.create(
-            name='testworkout',workouttype='On-water',
+            name='testworkout',workouttype='water',
 	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
 	    starttime=workoutstarttime,
             startdatetime=row.rowdatetime,
@@ -1083,7 +1083,7 @@ class WorkoutTests(TestCase):
         )
 	nu = datetime.datetime.now()
 	self.w = Workout.objects.create(name='testworkout',
-                                        workouttype='On-water',
+                                        workouttype='water',
 				   user=self.r,date=nu.strftime('%Y-%m-%d'),
 				   starttime=nu.strftime('%H:%M:%S'),
 				   duration="0:55:00",distance=8000)
@@ -1101,7 +1101,7 @@ class C2Tests(TestCase):
                                  gdproptindate=timezone.now()
         )
 	self.nu = datetime.datetime.now()
-	self.w = Workout.objects.create(name='testworkout',workouttype='On-water',
+	self.w = Workout.objects.create(name='testworkout',workouttype='water',
 				   user=r,date=nu.strftime('%Y-%m-%d'),
 				   starttime=nu.strftime('%H:%M:%S'),
 				   duration="0:55:00",distance=8000)
@@ -1264,7 +1264,7 @@ class DataTest(TestCase):
 	workoutdate = row.rowdatetime.strftime('%Y-%m-%d')
 	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
-	w = Workout.objects.create(name='testworkout',workouttype='On-water',
+	w = Workout.objects.create(name='testworkout',workouttype='water',
 				   user=r,date=self.nu.strftime('%Y-%m-%d'),
 				   starttime=workoutstarttime,
 				   duration=duration,distance=totaldist,
@@ -2008,7 +2008,7 @@ class URLTests(TestCase):
 	self.nu = datetime.datetime.now()
 	filename = 'rowers/testdata/testdata.csv'
 	self.wotw = Workout.objects.create(name='testworkout',
-					workouttype='On-water',
+					workouttype='water',
 					user=r,date=self.nu.strftime('%Y-%m-%d'),
 					starttime=self.nu.strftime('%H:%M:%S'),
 					duration="0:55:00",distance=8000,
@@ -2250,7 +2250,7 @@ class subroutinetests(TestCase):
 	nu = datetime.datetime.now()
 	filename = 'rowers/testdata/testdata.csv'
 	self.w = Workout.objects.create(name='testworkout',
-					workouttype='On-water',
+					workouttype='water',
 					user=r,date=nu.strftime('%Y-%m-%d'),
 					starttime=nu.strftime('%H:%M:%S'),
 					duration="0:55:00",distance=8000,
@@ -2275,7 +2275,7 @@ class PlotTests(TestCase):
 	self.nu = datetime.datetime.now()
 	filename = 'rowers/testdata/testdata.csv'
 	self.wotw = Workout.objects.create(name='testworkout',
-					workouttype='On-water',
+					workouttype='water',
 					user=r,date=self.nu.strftime('%Y-%m-%d'),
 					starttime=self.nu.strftime('%H:%M:%S'),
 					duration="0:55:00",distance=8000,