merge

rowers/tests/test_cpchart.py

@@ -11,38 +11,6 @@ import rowers.dataprep as dataprep
 
     
 
-class UserFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = User
-
-    email = faker.email()
-    username = faker.profile()['username']
-
-    first_name = faker.name().split(' ')[0]
-    last_name = faker.name().split(' ')[0]
-    
-class WorkoutFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = Workout
-
-    name = factory.LazyAttribute(lambda _: faker.word())
-    notes = faker.text()
-    startdatetime = row.rowdatetime
-    starttime = workoutstarttime
-    workouttype='water'
-    date=timezone.now().date()
-    duration=duration
-    distance=totaldist
-    csvfilename=filename
-    rankingpiece = False
-
-class SessionFactory(factory.DjangoModelFactory):
-    class Meta:
-        model = PlannedSession
-
-    name = factory.LazyAttribute(lambda _: faker.word())
-    comment = faker.text()
-
 class OTWCPChartTest(TestCase):
     def setUp(self):
         self.u = UserFactory()

rowers/tests/testdata/testdata.tcx

@@ -2502,11 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-<<<<<<< HEAD
-      <Notes>&lt;Element 'Notes' at 0x1477a860&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x13a97908&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x13699b70&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>