Skip to content
Snippets Groups Projects
Commit c6921568 authored by Kostia Balytskyi's avatar Kostia Balytskyi
Browse files

tests: make test-simplekeyvaluefile.py py2.6-compatible

Python 2.6 unittest.TestCase does not have assertRaisesRegexp.
parent 985a98c6
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
def testinvalidkeys(self): def testinvalidkeys(self):
d = {'0key1': 'value1', 'Key2': 'value2'} d = {'0key1': 'value1', 'Key2': 'value2'}
with self.assertRaisesRegexp(error.ProgrammingError, self.assertRaises(error.ProgrammingError,
"keys must start with a letter.*"): scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write,
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) d)
d = {'key1@': 'value1', 'Key2': 'value2'} d = {'key1@': 'value1', 'Key2': 'value2'}
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
d = {'key1@': 'value1', 'Key2': 'value2'} d = {'key1@': 'value1', 'Key2': 'value2'}
with self.assertRaisesRegexp(error.ProgrammingError, "invalid key.*"): self.assertRaises(error.ProgrammingError,
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write,
d)
def testinvalidvalues(self): def testinvalidvalues(self):
d = {'key1': 'value1', 'Key2': 'value2\n'} d = {'key1': 'value1', 'Key2': 'value2\n'}
...@@ -59,8 +60,9 @@ ...@@ -59,8 +60,9 @@
def testinvalidvalues(self): def testinvalidvalues(self):
d = {'key1': 'value1', 'Key2': 'value2\n'} d = {'key1': 'value1', 'Key2': 'value2\n'}
with self.assertRaisesRegexp(error.ProgrammingError, "invalid val.*"): self.assertRaises(error.ProgrammingError,
scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write,
d)
def testcorruptedfile(self): def testcorruptedfile(self):
self.vfs.contents['badfile'] = 'ababagalamaga\n' self.vfs.contents['badfile'] = 'ababagalamaga\n'
...@@ -64,9 +66,8 @@ ...@@ -64,9 +66,8 @@
def testcorruptedfile(self): def testcorruptedfile(self):
self.vfs.contents['badfile'] = 'ababagalamaga\n' self.vfs.contents['badfile'] = 'ababagalamaga\n'
with self.assertRaisesRegexp(error.CorruptedState, self.assertRaises(error.CorruptedState,
"dictionary.*element.*"): scmutil.simplekeyvaluefile(self.vfs, 'badfile').read)
scmutil.simplekeyvaluefile(self.vfs, 'badfile').read()
if __name__ == "__main__": if __name__ == "__main__":
silenttestrunner.main(__name__) silenttestrunner.main(__name__)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment