bla

rowers/tests/statements.py

@@ -72,7 +72,7 @@ from rowers.utils import calculate_age
 
 from rowers.tasks import handle_getagegrouprecords
 
-def get_random_file(filename='rowers/tests/testdata/testdata.csv'):
+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()
@@ -91,8 +91,12 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv'):
     workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
 
     extension = filename[-3:]
-    
-    newfilename = 'rowers/tests/testdata/temp/'+uuid4().hex[:16]+'.'+extension
+
+    if name != '':
+        newfilename = 'rowers/tests/testdata/temp/'+name+'.'+extension
+    else:
+        newfilename = 'rowers/tests/testdata/temp/'+uuid4().hex[:16]+'.'+extension
+
     copyfile(filename,newfilename)
 
     thedict = {
@@ -120,16 +124,17 @@ class UserFactory(factory.DjangoModelFactory):
 class WorkoutFactory(factory.DjangoModelFactory):
     class Meta:
         model = Workout
-
+        
     name = factory.LazyAttribute(lambda _: faker.word())
     notes = faker.text()
-    startdatetime = get_random_file()['startdatetime']
-    starttime = get_random_file()['starttime']
+    startdatetime = get_random_file(name=faker.word())['startdatetime']
+    starttime = get_random_file(name=faker.word())['starttime']
     workouttype='water'
     date=timezone.now().date()
-    duration=get_random_file()['duration']
-    distance=get_random_file()['totaldist']
-    csvfilename=get_random_file()['filename']
+    duration=get_random_file(name=faker.word())['duration']
+    distance=get_random_file(name=faker.word())['totaldist']
+    csvfilename=get_random_file(name=faker.word())['filename']
+
 
 class SessionFactory(factory.DjangoModelFactory):
     class Meta:

rowers/tests/test_newusers.py

@@ -11,7 +11,7 @@ class NewUserRegistrationTest(TestCase):
 
     def tearDown(self):
         try:
-            os.remove('rowsandall_workouts_2018-01-01_2019_2019-01-01.csv')
+            os.remove('rowsandall_workouts_2018-01-01_2019-01-01.csv')
         except:
             pass
             

rowers/tests/testdata/testdata.tcx

@@ -2502,7 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-      <Notes>&lt;Element 'Notes' at 0x154aea90&gt;</Notes>
+      <Notes>&lt;Element 'Notes' at 0x150748d0&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>