Skip to content

bpo-20554: Use specific asserts in optparse test #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
serhiy-storchaka wants to merge 1 commit into from
Closed

bpo-20554: Use specific asserts in optparse test #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Lib/test/test_optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,10 @@ def test_has_option(self):
self.assertTrue(self.parser.has_option("--verbose"))

def assertTrueremoved(self):
self.assertTrue(self.parser.get_option("-v") is None)
self.assertTrue(self.parser.get_option("--verbose") is None)
self.assertTrue(self.parser.get_option("-n") is None)
self.assertTrue(self.parser.get_option("--noisy") is None)
self.assertIsNone(self.parser.get_option("-v"))
self.assertIsNone(self.parser.get_option("--verbose"))
self.assertIsNone(self.parser.get_option("-n"))
self.assertIsNone(self.parser.get_option("--noisy"))

self.assertFalse(self.parser.has_option("-v"))
self.assertFalse(self.parser.has_option("--verbose"))
Expand Down Expand Up @@ -799,13 +799,13 @@ def test_bool_false(self):
(options, args) = self.assertParseOK(["-q"],
{'verbose': 0},
[])
self.assertTrue(options.verbose is False)
self.assertIs(options.verbose, False)

def test_bool_true(self):
(options, args) = self.assertParseOK(["-v"],
{'verbose': 1},
[])
self.assertTrue(options.verbose is True)
self.assertIs(options.verbose, True)

def test_bool_flicker_on_and_off(self):
self.assertParseOK(["-qvq", "-q", "-v"],
Expand Down Expand Up @@ -1107,15 +1107,15 @@ def process_opt(self, option, opt, value, parser_):
if opt == "-x":
self.assertEqual(option._short_opts, ["-x"])
self.assertEqual(option._long_opts, [])
self.assertTrue(parser_ is self.parser)
self.assertTrue(value is None)
self.assertIs(parser_, self.parser)
self.assertIsNone(value)
self.assertEqual(vars(parser_.values), {'filename': None})

parser_.values.x = 42
elif opt == "--file":
self.assertEqual(option._short_opts, ["-f"])
self.assertEqual(option._long_opts, ["--file"])
self.assertTrue(parser_ is self.parser)
self.assertIs(parser_, self.parser)
self.assertEqual(value, "foo")
self.assertEqual(vars(parser_.values), {'filename': None, 'x': 42})

Expand Down Expand Up @@ -1153,7 +1153,7 @@ def setUp(self):

def process_tuple(self, option, opt, value, parser_, len, type):
self.assertEqual(len, 3)
self.assertTrue(type is int)
self.assertIs(type, int)

if opt == "-p":
self.assertEqual(value, "1,2,3")
Expand Down Expand Up @@ -1244,7 +1244,7 @@ def setUp(self):
option_list=options)

def variable_args(self, option, opt, value, parser):
self.assertTrue(value is None)
self.assertIsNone(value)
value = []
rargs = parser.rargs
while rargs:
Expand Down Expand Up @@ -1335,8 +1335,8 @@ def test_conflict_resolve(self):
verbose_opt = self.parser.get_option("--verbose")
version_opt = self.parser.get_option("--version")

self.assertTrue(v_opt is version_opt)
self.assertTrue(v_opt is not verbose_opt)
self.assertIs(v_opt, version_opt)
self.assertIsNot(v_opt, verbose_opt)
self.assertEqual(v_opt._long_opts, ["--version"])
self.assertEqual(version_opt._short_opts, ["-v"])
self.assertEqual(version_opt._long_opts, ["--version"])
Expand Down