at 18.03-beta 42 lines 2.6 kB view raw
1diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py 2--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100 3+++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100 4@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase): 5 self.assertEquals(self.activity.time, self.activity.duration) 6 7 def test_activity_starttime(self): 8- self.assertEquals(self.activity.starttime, '12:58:23 PM') 9+ self.assertEquals(self.activity.starttime, '12:58:23') 10 11 def test_activity_time_tuple(self): 12 self.assertEquals(self.activity.time_tuple, (2, 3, 46)) 13diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py 14--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100 15+++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100 16@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase) 17 self.fail() 18 19 def test_workout_summary(self): 20- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] 21+ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] 22 try: 23 current_path = os.path.dirname(os.path.abspath(__file__)) 24 data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/" 25@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase) 26 self.fail() 27 28 def test_summary_in_database(self): 29- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')] 30+ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] 31 activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') 32 self.ddbb.session.add(activity) 33 self.ddbb.session.commit() 34diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py 35--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 36+++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 37@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase 38 def test_getDateTime(self): 39 utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') 40 self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) 41- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) 42+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)