diff options
author | Éric Araujo <merwok@netwok.org> | 2011-11-06 09:48:55 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-11-06 09:48:55 (GMT) |
commit | 261ccdce4825535d4f6ea4bf09e9394bb751df20 (patch) | |
tree | 728ea760c788527786bd04fa44e66bf445f1d638 /Lib/packaging | |
parent | a963e0d917d71079910d31b69a1cc8a06b74edbe (diff) | |
download | cpython-261ccdce4825535d4f6ea4bf09e9394bb751df20.zip cpython-261ccdce4825535d4f6ea4bf09e9394bb751df20.tar.gz cpython-261ccdce4825535d4f6ea4bf09e9394bb751df20.tar.bz2 |
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.)
Diffstat (limited to 'Lib/packaging')
-rw-r--r-- | Lib/packaging/tests/test_command_clean.py | 2 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_install_data.py | 2 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_register.py | 1 | ||||
-rw-r--r-- | Lib/packaging/tests/test_command_sdist.py | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Lib/packaging/tests/test_command_clean.py b/Lib/packaging/tests/test_command_clean.py index ab944ed..a78c3a7 100644 --- a/Lib/packaging/tests/test_command_clean.py +++ b/Lib/packaging/tests/test_command_clean.py @@ -36,8 +36,6 @@ class cleanTestCase(support.TempdirManager, support.LoggingCatcher, '%r was not removed' % path) # let's run the command again (should spit warnings but succeed) - cmd.all = True - cmd.ensure_finalized() cmd.run() diff --git a/Lib/packaging/tests/test_command_install_data.py b/Lib/packaging/tests/test_command_install_data.py index 94d6a21..8d4373d 100644 --- a/Lib/packaging/tests/test_command_install_data.py +++ b/Lib/packaging/tests/test_command_install_data.py @@ -62,6 +62,7 @@ class InstallDataTestCase(support.TempdirManager, # let's try with warn_dir one cmd.warn_dir = True + cmd.finalized = False cmd.ensure_finalized() cmd.run() @@ -80,6 +81,7 @@ class InstallDataTestCase(support.TempdirManager, cmd.data_files = {one: '{inst}/one', two: '{inst2}/two', three: '{inst3}/three'} + cmd.finalized = False cmd.ensure_finalized() cmd.run() diff --git a/Lib/packaging/tests/test_command_register.py b/Lib/packaging/tests/test_command_register.py index 73d9834..1903abe 100644 --- a/Lib/packaging/tests/test_command_register.py +++ b/Lib/packaging/tests/test_command_register.py @@ -143,6 +143,7 @@ class RegisterTestCase(support.TempdirManager, register_module.input = _no_way cmd.show_response = True + cmd.finalized = False cmd.ensure_finalized() cmd.run() diff --git a/Lib/packaging/tests/test_command_sdist.py b/Lib/packaging/tests/test_command_sdist.py index 34a2e9c..0b9f5be 100644 --- a/Lib/packaging/tests/test_command_sdist.py +++ b/Lib/packaging/tests/test_command_sdist.py @@ -140,7 +140,7 @@ class SDistTestCase(support.TempdirManager, # now trying a tar then a gztar cmd.formats = ['tar', 'gztar'] - + cmd.finalized = False cmd.ensure_finalized() cmd.run() |