Skip to content

Commit 742b448

Browse files
committed
Change plurality of assert for python3.5.
1 parent d1d6d37 commit 742b448

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

tests/test_sequence_algo.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -70,50 +70,50 @@ def test_expand_surrounded_by_clips(self):
7070
# print "AFTER:"
7171
# print_expanded_tree(seq2)
7272

73-
self.assertNotEquals(pre_duration, seq2[0].source_range.duration)
73+
self.assertNotEqual(pre_duration, seq2[0].source_range.duration)
7474

7575
# check ranges on results
7676

7777
# first clip is trimmed
78-
self.assertEquals(
78+
self.assertEqual(
7979
seq2[0].source_range.duration,
8080
cl_2.source_range.duration - in_offset
8181
)
8282

83-
self.assertEquals(
83+
self.assertEqual(
8484
seq2[1][0].source_range.start_time,
8585
cl.source_range.end_time_exclusive() - in_offset
8686
)
87-
self.assertEquals(
87+
self.assertEqual(
8888
seq2[1][0].source_range.duration,
8989
in_offset + out_offset
9090
)
91-
self.assertEquals(
91+
self.assertEqual(
9292
seq2[1][2].source_range.start_time,
9393
cl_2.source_range.start_time - in_offset
9494
)
95-
self.assertEquals(
95+
self.assertEqual(
9696
seq2[1][2].source_range.duration,
9797
in_offset + out_offset
9898
)
9999

100100
# final clip is trimmed
101-
self.assertEquals(
101+
self.assertEqual(
102102
seq2[2].source_range.duration,
103103
cl_2.source_range.duration - out_offset
104104
)
105105

106106
# make sure that both transition clips are the same length
107-
self.assertEquals(
107+
self.assertEqual(
108108
seq2[1][0].source_range.duration,
109109
seq2[1][2].source_range.duration
110110
)
111111

112112
# big hammer stuff
113-
self.assertNotEquals(seq, seq2)
114-
self.assertNotEquals(seq[0], seq2[0])
115-
self.assertNotEquals(seq[-1], seq2[-1])
116-
self.assertNotEquals(seq[-1].source_range, seq2[-1].source_range)
113+
self.assertNotEqual(seq, seq2)
114+
self.assertNotEqual(seq[0], seq2[0])
115+
self.assertNotEqual(seq[-1], seq2[-1])
116+
self.assertNotEqual(seq[-1].source_range, seq2[-1].source_range)
117117

118118
# leaving this here as a @TODO
119119
def DISABLED_test_expand_sequence(self):
@@ -165,53 +165,53 @@ def DISABLED_test_expand_sequence(self):
165165
# print "AFTER:"
166166
# print_expanded_tree(expanded_seq)
167167

168-
self.assertNotEquals(
168+
self.assertNotEqual(
169169
pre_duration,
170170
expanded_seq[0].source_range.duration
171171
)
172172

173173
# check ranges on results
174174

175175
# first clip is trimmed
176-
self.assertEquals(
176+
self.assertEqual(
177177
expanded_seq[0].source_range.duration,
178178
seq_2.source_range.duration - in_offset
179179
)
180180

181-
self.assertEquals(
181+
self.assertEqual(
182182
expanded_seq[1][0].source_range.start_time,
183183
cl.source_range.end_time_exclusive() - in_offset
184184
)
185-
self.assertEquals(
185+
self.assertEqual(
186186
expanded_seq[1][0].source_range.duration,
187187
in_offset + out_offset
188188
)
189-
self.assertEquals(
189+
self.assertEqual(
190190
expanded_seq[1][2].source_range.start_time,
191191
seq_2.source_range.start_time - in_offset
192192
)
193-
self.assertEquals(
193+
self.assertEqual(
194194
expanded_seq[1][2].source_range.duration,
195195
in_offset + out_offset
196196
)
197197

198198
# final clip is trimmed
199-
self.assertEquals(
199+
self.assertEqual(
200200
expanded_seq[2].source_range.duration,
201201
seq_2.source_range.duration - out_offset
202202
)
203203

204204
# make sure that both transition clips are the same length
205-
self.assertEquals(
205+
self.assertEqual(
206206
expanded_seq[1][0].source_range.duration,
207207
expanded_seq[1][2].source_range.duration
208208
)
209209

210210
# big hammer stuff
211-
self.assertNotEquals(seq, expanded_seq)
212-
self.assertNotEquals(seq[0], expanded_seq[0])
213-
self.assertNotEquals(seq[-1], expanded_seq[-1])
214-
self.assertNotEquals(
211+
self.assertNotEqual(seq, expanded_seq)
212+
self.assertNotEqual(seq[0], expanded_seq[0])
213+
self.assertNotEqual(seq[-1], expanded_seq[-1])
214+
self.assertNotEqual(
215215
seq[-1].source_range,
216216
expanded_seq[-1].source_range
217217
)

0 commit comments

Comments
 (0)