steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Add Python 2.7 workaround for Dashboard tests and add missing `__init__.py` file.

This commit is contained in:
Christopher Charbonneau Wells 2017-11-19 12:39:59 -05:00
parent 880d7ca19f
commit 9f7d84013e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
babybuddy/templatetags/__init__.py Normal file
View File

13
dashboard/tests/tests_templatetags.py
View File

@ -5,6 +5,8 @@ from django.contrib.auth.models import User
from django.test import TestCase from django.test import TestCase
from django.utils import timezone from django.utils import timezone
import six
from core import models from core import models
from dashboard.templatetags import cards from dashboard.templatetags import cards
@ -30,10 +32,8 @@ class TemplateTagsTestCase(TestCase):
data = cards.card_diaperchange_types(self.child, self.date) data = cards.card_diaperchange_types(self.child, self.date)
self.assertEqual(data['type'], 'diaperchange') self.assertEqual(data['type'], 'diaperchange')
stats = { stats = {
0: {'wet_pct': 66.66666666666666, 'solid_pct': 33.33333333333333, 0: {'wet_pct': 50.0, 'solid_pct': 50.0, 'solid': 1, 'wet': 1},
'solid': 1, 'wet': 2}, 1: {'wet_pct': 0.0, 'solid_pct': 100.0, 'solid': 2, 'wet': 0},
1: {'wet_pct': 33.33333333333333, 'solid_pct': 66.66666666666666,
'solid': 2, 'wet': 1},
2: {'wet_pct': 100.0, 'solid_pct': 0.0, 'solid': 0, 'wet': 2}, 2: {'wet_pct': 100.0, 'solid_pct': 0.0, 'solid': 0, 'wet': 2},
3: {'wet_pct': 75.0, 'solid_pct': 25.0, 'solid': 1, 'wet': 3}, 3: {'wet_pct': 75.0, 'solid_pct': 25.0, 'solid': 1, 'wet': 3},
4: {'wet_pct': 100.0, 'solid_pct': 0.0, 'solid': 0, 'wet': 1}, 4: {'wet_pct': 100.0, 'solid_pct': 0.0, 'solid': 0, 'wet': 1},
@ -114,6 +114,11 @@ class TemplateTagsTestCase(TestCase):
'float' 'float'
} }
] ]
# Python 2 comes up with a slightly different number for one record.
if six.PY2:
stats[0]['stat'] = timezone.timedelta(0, 44228, 571428)
self.assertEqual(data['stats'], stats) self.assertEqual(data['stats'], stats)
def test_card_timer_list(self): def test_card_timer_list(self):