equal
deleted
inserted
replaced
221 # Merge code wants to set 21-byte fake hashes at times |
221 # Merge code wants to set 21-byte fake hashes at times |
222 m[b'foo'] = want |
222 m[b'foo'] = want |
223 self.assertEqual(want, m[b'foo']) |
223 self.assertEqual(want, m[b'foo']) |
224 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
224 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
225 (b'foo', BIN_HASH_1 + b'a')], |
225 (b'foo', BIN_HASH_1 + b'a')], |
226 list(m.iteritems())) |
226 list(m.items())) |
227 # Sometimes it even tries a 22-byte fake hash, but we can |
227 # Sometimes it even tries a 22-byte fake hash, but we can |
228 # return 21 and it'll work out |
228 # return 21 and it'll work out |
229 m[b'foo'] = want + b'+' |
229 m[b'foo'] = want + b'+' |
230 self.assertEqual(want, m[b'foo']) |
230 self.assertEqual(want, m[b'foo']) |
231 # make sure the suffix survives a copy |
231 # make sure the suffix survives a copy |
236 m2 = m.copy() |
236 m2 = m.copy() |
237 self.assertEqual(want, m2[b'foo']) |
237 self.assertEqual(want, m2[b'foo']) |
238 # suffix with iteration |
238 # suffix with iteration |
239 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
239 self.assertEqual([(b'bar/baz/qux.py', BIN_HASH_2), |
240 (b'foo', want)], |
240 (b'foo', want)], |
241 list(m.iteritems())) |
241 list(m.items())) |
242 |
242 |
243 # shows up in diff |
243 # shows up in diff |
244 self.assertEqual({b'foo': ((want, f), (h, b''))}, m.diff(clean)) |
244 self.assertEqual({b'foo': ((want, f), (h, b''))}, m.diff(clean)) |
245 self.assertEqual({b'foo': ((h, b''), (want, f))}, clean.diff(m)) |
245 self.assertEqual({b'foo': ((h, b''), (want, f))}, clean.diff(m)) |
246 |
246 |