To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/tests/test_generate_ids.py
- browse files at revision 6973.12.1
- compare with another revision
- compare with revision 5200.3.2
- download diff
- download tarball
- view history from revision 6973.12.1
- Committer: Jelmer Vernooij
- Date: 2018-06-22 02:22:23 UTC
- mto: (6973.13.5 python3-l)
- mto: This revision was merged to the branch mainline in revision 7011.
- Revision ID: jelmer@jelmer.uk-20180622022223-w5hnlijf3j7rm6na
Fix more tests.
added
removed
breezy/tests/test_generate_ids.py
41
41
gen_file_id = generate_ids.gen_file_id
42
42
43
43
# We try to use the filename if possible
44
self.assertStartsWith(gen_file_id('bar'), 'bar-')
44
self.assertStartsWith(gen_file_id('bar'), b'bar-')
45
45
46
46
# but we squash capitalization, and remove non word characters
47
47
self.assertStartsWith(gen_file_id('Mwoo oof\t m'), 'mwoooofm-')
83
83
self.assertNotEqual(None, generate_ids._gen_file_id_suffix)
84
84
85
85
def test__next_id_suffix_increments(self):
86
generate_ids._gen_file_id_suffix = "foo-"
86
generate_ids._gen_file_id_suffix = b"foo-"
87
87
generate_ids._gen_file_id_serial = 1
88
88
try:
89
self.assertEqual("foo-2", generate_ids._next_id_suffix())
90
self.assertEqual("foo-3", generate_ids._next_id_suffix())
91
self.assertEqual("foo-4", generate_ids._next_id_suffix())
92
self.assertEqual("foo-5", generate_ids._next_id_suffix())
93
self.assertEqual("foo-6", generate_ids._next_id_suffix())
94
self.assertEqual("foo-7", generate_ids._next_id_suffix())
95
self.assertEqual("foo-8", generate_ids._next_id_suffix())
96
self.assertEqual("foo-9", generate_ids._next_id_suffix())
97
self.assertEqual("foo-10", generate_ids._next_id_suffix())
89
self.assertEqual(b"foo-2", generate_ids._next_id_suffix())
90
self.assertEqual(b"foo-3", generate_ids._next_id_suffix())
91
self.assertEqual(b"foo-4", generate_ids._next_id_suffix())
92
self.assertEqual(b"foo-5", generate_ids._next_id_suffix())
93
self.assertEqual(b"foo-6", generate_ids._next_id_suffix())
94
self.assertEqual(b"foo-7", generate_ids._next_id_suffix())
95
self.assertEqual(b"foo-8", generate_ids._next_id_suffix())
96
self.assertEqual(b"foo-9", generate_ids._next_id_suffix())
97
self.assertEqual(b"foo-10", generate_ids._next_id_suffix())
98
98
finally:
99
99
# Reset so that all future ids generated in the test suite
100
100
# don't end in 'foo-XXX'
113
113
def assertGenRevisionId(self, regex, username, timestamp=None):
114
114
"""gen_revision_id should create a revision id matching the regex"""
115
115
revision_id = generate_ids.gen_revision_id(username, timestamp)
116
self.assertContainsRe(revision_id, '^'+regex+'$')
116
self.assertContainsRe(revision_id, b'^'+regex+b'$')
117
117
# It should be a utf8 revision_id, not a unicode one
118
self.assertIsInstance(revision_id, str)
118
self.assertIsInstance(revision_id, bytes)
119
119
# gen_revision_id should always return ascii revision ids.
120
120
revision_id.decode('ascii')
121
121
122
122
def test_timestamp(self):
123
123
"""passing a timestamp should cause it to be used"""
124
self.assertGenRevisionId(r'user@host-\d{14}-[a-z0-9]{16}', 'user@host')
125
self.assertGenRevisionId('user@host-20061102205056-[a-z0-9]{16}',
124
self.assertGenRevisionId(br'user@host-\d{14}-[a-z0-9]{16}', 'user@host')
125
self.assertGenRevisionId(b'user@host-20061102205056-[a-z0-9]{16}',
126
126
'user@host', 1162500656.688)
127
self.assertGenRevisionId(r'user@host-20061102205024-[a-z0-9]{16}',
127
self.assertGenRevisionId(br'user@host-20061102205024-[a-z0-9]{16}',
128
128
'user@host', 1162500624.000)
129
129
130
130
def test_gen_revision_id_email(self):
131
131
"""gen_revision_id uses email address if present"""
132
regex = r'user\+joe_bar@foo-bar\.com-\d{14}-[a-z0-9]{16}'
132
regex = br'user\+joe_bar@foo-bar\.com-\d{14}-[a-z0-9]{16}'
133
133
self.assertGenRevisionId(regex, 'user+joe_bar@foo-bar.com')
134
134
self.assertGenRevisionId(regex, '<user+joe_bar@foo-bar.com>')
135
135
self.assertGenRevisionId(regex, 'Joe Bar <user+joe_bar@foo-bar.com>')
138
138
139
139
def test_gen_revision_id_user(self):
140
140
"""If there is no email, fall back to the whole username"""
141
tail = r'-\d{14}-[a-z0-9]{16}'
142
self.assertGenRevisionId('joe_bar' + tail, 'Joe Bar')
143
self.assertGenRevisionId('joebar' + tail, 'joebar')
144
self.assertGenRevisionId('joe_br' + tail, u'Joe B\xe5r')
145
self.assertGenRevisionId(r'joe_br_user\+joe_bar_foo-bar.com' + tail,
141
tail = br'-\d{14}-[a-z0-9]{16}'
142
self.assertGenRevisionId(b'joe_bar' + tail, 'Joe Bar')
143
self.assertGenRevisionId(b'joebar' + tail, 'joebar')
144
self.assertGenRevisionId(b'joe_br' + tail, u'Joe B\xe5r')
145
self.assertGenRevisionId(br'joe_br_user\+joe_bar_foo-bar.com' + tail,
146
146
u'Joe B\xe5r <user+Joe_Bar_Foo-Bar.com>')
147
147
148
148
def test_revision_ids_are_ascii(self):
149
149
"""gen_revision_id should always return an ascii revision id."""
150
tail = r'-\d{14}-[a-z0-9]{16}'
151
self.assertGenRevisionId('joe_bar' + tail, 'Joe Bar')
152
self.assertGenRevisionId('joe_bar' + tail, u'Joe Bar')
153
self.assertGenRevisionId('joe@foo' + tail, u'Joe Bar <joe@foo>')
150
tail = br'-\d{14}-[a-z0-9]{16}'
151
self.assertGenRevisionId(b'joe_bar' + tail, 'Joe Bar')
152
self.assertGenRevisionId(b'joe_bar' + tail, u'Joe Bar')
153
self.assertGenRevisionId(b'joe@foo' + tail, u'Joe Bar <joe@foo>')
154
154
# We cheat a little with this one, because email-addresses shouldn't
155
155
# contain non-ascii characters, but generate_ids should strip them
156
156
# anyway.
157
self.assertGenRevisionId('joe@f' + tail, u'Joe Bar <joe@f\xb6>')
157
self.assertGenRevisionId(b'joe@f' + tail, u'Joe Bar <joe@f\xb6>')
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0