This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3528

tests: port test-simplekeyvaluefile.py to Python 3
ClosedPublic

Authored by durin42 on May 10 2018, 11:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6eca47f6319d: tests: port test-simplekeyvaluefile.py to Python 3
rHG7ffa19d17188: tests: port test-simplekeyvaluefile.py to Python 3
rHG5f3b58d49b05: tests: port test-simplekeyvaluefile.py to Python 3
Summary
  1. skip-blame just b prefixes

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 10 2018, 11:16 AM
pulkit accepted this revision.May 10 2018, 11:35 AM
Closed by commit rHG5f3b58d49b05: tests: port test-simplekeyvaluefile.py to Python 3 (authored by durin42). · Explain WhyMay 10 2018, 2:47 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.May 11 2018, 8:08 AM
  • scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d)

+ scmutil.simplekeyvaluefile(self.vfs, 'bkvfile').write(d)

Fixed as b'kvfile' in flight.

Revision Contents
Changeset List

Diff 8633

contrib/python3-whitelist

test-serve.t test-serve.t
test-setdiscovery.t test-setdiscovery.t
test-share.t test-share.t
test-shelve.t test-shelve.t
test-show-stack.t test-show-stack.t
test-show-work.t test-show-work.t
test-show.t test-show.t
test-simple-update.t test-simple-update.t
test-simplekeyvaluefile.py
test-simplemerge.py test-simplemerge.py
test-single-head.t test-single-head.t
test-sparse-clear.t test-sparse-clear.t
test-sparse-import.t test-sparse-import.t
test-sparse-merges.t test-sparse-merges.t
test-sparse-profiles.t test-sparse-profiles.t
test-sparse-requirement.t test-sparse-requirement.t
test-sparse-verbose-json.t test-sparse-verbose-json.t

tests/test-simplekeyvaluefile.py

def __call__(self, path, mode, atomictemp): def __call__(self, path, mode, atomictemp):
return mockfile(path, self) return mockfile(path, self)
class testsimplekeyvaluefile(unittest.TestCase): class testsimplekeyvaluefile(unittest.TestCase):
def setUp(self): def setUp(self):
self.vfs = mockvfs() self.vfs = mockvfs()
def testbasicwritingiandreading(self): def testbasicwritingiandreading(self):
dw = {'key1': 'value1', 'Key2': 'value2'} dw = {b'key1': b'value1', b'Key2': b'value2'}
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(dw) scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(dw)
self.assertEqual(sorted(self.vfs.read('kvfile').split('\n')), self.assertEqual(sorted(self.vfs.read(b'kvfile').split(b'\n')),
['', 'Key2=value2', 'key1=value1']) [b'', b'Key2=value2', b'key1=value1'])
dr = scmutil.simplekeyvaluefile(self.vfs, 'kvfile').read() dr = scmutil.simplekeyvaluefile(self.vfs, b'kvfile').read()
self.assertEqual(dr, dw) self.assertEqual(dr, dw)
if not getattr(unittest.TestCase, 'assertRaisesRegex', False): if not getattr(unittest.TestCase, 'assertRaisesRegex', False):
# Python 3.7 deprecates the regex*p* version, but 2.7 lacks # Python 3.7 deprecates the regex*p* version, but 2.7 lacks
# the regex version. # the regex version.
assertRaisesRegex = (# camelcase-required assertRaisesRegex = (# camelcase-required
unittest.TestCase.assertRaisesRegexp) unittest.TestCase.assertRaisesRegexp)
def testinvalidkeys(self): def testinvalidkeys(self):
d = {'0key1': 'value1', 'Key2': 'value2'} d = {b'0key1': b'value1', b'Key2': b'value2'}
with self.assertRaisesRegex(error.ProgrammingError, with self.assertRaisesRegex(error.ProgrammingError,
'keys must start with a letter.*'): 'keys must start with a letter.*'):
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(d)
d = {'key1@': 'value1', 'Key2': 'value2'} d = {b'key1@': b'value1', b'Key2': b'value2'}
with self.assertRaisesRegex(error.ProgrammingError, 'invalid key.*'): with self.assertRaisesRegex(error.ProgrammingError, 'invalid key.*'):
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) scmutil.simplekeyvaluefile(self.vfs, b'kvfile').write(d)
def testinvalidvalues(self): def testinvalidvalues(self):
d = {'key1': 'value1', 'Key2': 'value2\n'} d = {b'key1': b'value1', b'Key2': b'value2\n'}
with self.assertRaisesRegex(error.ProgrammingError, 'invalid val.*'): with self.assertRaisesRegex(error.ProgrammingError, 'invalid val.*'):
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) scmutil.simplekeyvaluefile(self.vfs, 'bkvfile').write(d)
def testcorruptedfile(self): def testcorruptedfile(self):
self.vfs.contents['badfile'] = 'ababagalamaga\n' self.vfs.contents[b'badfile'] = b'ababagalamaga\n'
with self.assertRaisesRegex(error.CorruptedState, with self.assertRaisesRegex(error.CorruptedState,
'dictionary.*element.*'): 'dictionary.*element.*'):
scmutil.simplekeyvaluefile(self.vfs, 'badfile').read() scmutil.simplekeyvaluefile(self.vfs, b'badfile').read()
def testfirstline(self): def testfirstline(self):
dw = {'key1': 'value1'} dw = {b'key1': b'value1'}
scmutil.simplekeyvaluefile(self.vfs, 'fl').write(dw, firstline='1.0') scmutil.simplekeyvaluefile(self.vfs, b'fl').write(dw, firstline=b'1.0')
self.assertEqual(self.vfs.read('fl'), '1.0\nkey1=value1\n') self.assertEqual(self.vfs.read(b'fl'), b'1.0\nkey1=value1\n')
dr = scmutil.simplekeyvaluefile(self.vfs, 'fl')\ dr = scmutil.simplekeyvaluefile(self.vfs, b'fl')\
.read(firstlinenonkeyval=True) .read(firstlinenonkeyval=True)
self.assertEqual(dr, {'__firstline': '1.0', 'key1': 'value1'}) self.assertEqual(dr, {b'__firstline': b'1.0', b'key1': b'value1'})
if __name__ == "__main__": if __name__ == "__main__":
silenttestrunner.main(__name__) silenttestrunner.main(__name__)