mirror of https://github.com/python/cpython.git
Minor tweak to packaging tests.
When an option is changed on a command object, calling ensure_finalized for a second time will not run finalize_options again, because ensure_finalized is a no-op the second time. By resetting the finalized attribute, we can be sure that whatever computation takes place in finalize_options will happen again. (In test_command_clean, I removed two lines that were a no-op.)
This commit is contained in:
parent
a963e0d917
commit
261ccdce48
|
@ -36,8 +36,6 @@ def test_simple_run(self):
|
||||||
'%r was not removed' % path)
|
'%r was not removed' % path)
|
||||||
|
|
||||||
# let's run the command again (should spit warnings but succeed)
|
# let's run the command again (should spit warnings but succeed)
|
||||||
cmd.all = True
|
|
||||||
cmd.ensure_finalized()
|
|
||||||
cmd.run()
|
cmd.run()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ def test_simple_run(self):
|
||||||
|
|
||||||
# let's try with warn_dir one
|
# let's try with warn_dir one
|
||||||
cmd.warn_dir = True
|
cmd.warn_dir = True
|
||||||
|
cmd.finalized = False
|
||||||
cmd.ensure_finalized()
|
cmd.ensure_finalized()
|
||||||
cmd.run()
|
cmd.run()
|
||||||
|
|
||||||
|
@ -80,6 +81,7 @@ def test_simple_run(self):
|
||||||
|
|
||||||
cmd.data_files = {one: '{inst}/one', two: '{inst2}/two',
|
cmd.data_files = {one: '{inst}/one', two: '{inst2}/two',
|
||||||
three: '{inst3}/three'}
|
three: '{inst3}/three'}
|
||||||
|
cmd.finalized = False
|
||||||
cmd.ensure_finalized()
|
cmd.ensure_finalized()
|
||||||
cmd.run()
|
cmd.run()
|
||||||
|
|
||||||
|
|
|
@ -143,6 +143,7 @@ def _no_way(prompt=''):
|
||||||
|
|
||||||
register_module.input = _no_way
|
register_module.input = _no_way
|
||||||
cmd.show_response = True
|
cmd.show_response = True
|
||||||
|
cmd.finalized = False
|
||||||
cmd.ensure_finalized()
|
cmd.ensure_finalized()
|
||||||
cmd.run()
|
cmd.run()
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ def test_make_distribution(self):
|
||||||
|
|
||||||
# now trying a tar then a gztar
|
# now trying a tar then a gztar
|
||||||
cmd.formats = ['tar', 'gztar']
|
cmd.formats = ['tar', 'gztar']
|
||||||
|
cmd.finalized = False
|
||||||
cmd.ensure_finalized()
|
cmd.ensure_finalized()
|
||||||
cmd.run()
|
cmd.run()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue