Skip to content

Commit c9d336e

Browse files
committedFeb 8, 2018
fix tests. Remove subTest for py2.7
1 parent 1d7b910 commit c9d336e

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed
 

‎tests/tests/test_templatetags.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ def _callFUT(self, num):
6363
return t.render(Context({'num': num}))
6464

6565
def test_repeat(self):
66-
test_patterns = (
67-
# (num, expected),
68-
(5, '-----'),
69-
(0, ''),
70-
)
71-
for num, expected in test_patterns:
72-
with self.subTest(num=num):
73-
self.assertEqual(expected, self._callFUT(num))
66+
self.assertEqual('-----', self._callFUT(5))
67+
68+
def test_repeat_zero_length(self):
69+
self.assertEqual('', self._callFUT(0))

‎tests/tests/test_wrappers.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,15 @@ def test_display_name(self, mock):
141141

142142
@mock.patch('modelsdoc.wrappers.class_to_string', return_value='dummy')
143143
def test_display_name_length(self, mock):
144-
test_patterns = (
145-
# (verbose_name, expected)
146-
('name', 11), # "name" + "(dummy)" => 11
147-
('日本', 13), # "日本" + "(dummy)" => 13
148-
)
149-
for verbose_name, excpected in test_patterns:
150-
with self.subTest(verbose_name=verbose_name):
151-
meta = self._getDummyMeta(verbose_name=verbose_name)
152-
target = self._makeOne(self._getDummyModel(meta=meta), 'connection')
153-
self.assertEqual(excpected, target.display_name_length)
144+
meta = self._getDummyMeta(verbose_name='name')
145+
target = self._makeOne(self._getDummyModel(meta=meta), 'connection')
146+
self.assertEqual(11, target.display_name_length)
147+
148+
@mock.patch('modelsdoc.wrappers.class_to_string', return_value='dummy')
149+
def test_display_name_length_for_multibyte(self, mock):
150+
meta = self._getDummyMeta(verbose_name=u'日本')
151+
target = self._makeOne(self._getDummyModel(meta=meta), 'connection')
152+
self.assertEqual(13, target.display_name_length)
154153

155154
def test_doc(self):
156155
target = self._makeOne(self._getDummyModel(), 'connection')

0 commit comments

Comments
 (0)
Please sign in to comment.