Open
Conversation
…distutils, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
…Subset, distutils, and utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/8d432548-1f18-44b2-9fea-496226ca1f79 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
…ls, utcnow Agent-Logs-Url: https://github.com/saltstack/salt/sessions/2589ab85-0b14-4b58-a74b-0e3c226cb53d Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
…ypp_plugins.py, test_pip.py) Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
…d-pip test cases Agent-Logs-Url: https://github.com/saltstack/salt/sessions/ac7d00ce-330f-49d8-83c6-e7fcd6f5ed69 Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
Agent-Logs-Url: https://github.com/saltstack/salt/sessions/186b30f6-8024-4036-af58-06e11835d7bb Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
- tests/unit/test_zypp_plugins.py: replace `import imp` (removed in Python 3.12) with `importlib.util`, and replace `imp.load_source()` with `spec_from_file_location` + `module_from_spec` + `exec_module` - salt/modules/virtualenv_mod.py: fix `get_distribution_path` to use `importlib.metadata` instead of `pkg_resources`; old setuptools references `pkgutil.ImpImporter` which was removed in Python 3.12 - salt/utils/versions.py: replace `datetime.utcnow()` (deprecated in Python 3.12) with `datetime.now(datetime.timezone.utc)` to eliminate the DeprecationWarning that breaks test_deprecation_warnings[env0-False] Agent-Logs-Url: https://github.com/saltstack/salt/sessions/80a13379-dae2-4c51-bff3-d9e06c170f4b Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>
Replace deprecated datetime.utcnow() calls with a compatibility function that uses datetime.now(timezone.utc) for Python 3.12+ and falls back to datetime.utcnow() for older versions. Also fix zeromq test that failed due to accessing uninitialized socket object by calling _init_socket() before socket access. Changes: - Add salt.utils.timeutil.utcnow() compatibility function - Replace all datetime.utcnow() calls across salt modules - Fix test_request_client_send_recv_loop_closed socket initialization
Use named argument format to avoid duplicate 'distribution' parameter in string formatting.
Replace datetime.datetime.utcnow() calls in transport_ssl.py test fixtures with salt.utils.timeutil.utcnow() to avoid deprecation warnings in Python 3.12+.
Replace remaining datetime.utcnow() calls in test files with salt.utils.timeutil.utcnow() to avoid deprecation errors when RAISE_DEPRECATIONS_RUNTIME_ERRORS=1 in Python 3.12+. Fixed files: - tests/pytests/functional/modules/test_system.py (8 occurrences) - tests/pytests/unit/test_fileserver.py (1 occurrence) - tests/pytests/unit/utils/test_aws.py (7 occurrences) - tests/unit/modules/test_x509.py (3 occurrences)
In Python 3.12, importlib.util.spec_from_file_location() returns None for files without .py extension when it cannot infer the loader. The zyppnotify file lacks a .py extension, causing the spec to be None and resulting in AttributeError when trying to access spec.loader. Fix by explicitly using importlib.machinery.SourceFileLoader to create the spec, which works regardless of file extension.
1. Fix datetime.utcnow() to return naive datetime
- pytz.localize() requires naive datetime objects
- Updated utcnow() wrapper to strip timezone info for compatibility
2. Add datetime.utcfromtimestamp() wrapper
- Deprecated in Python 3.12
- Created utcfromtimestamp() in salt.utils.timeutil
- Replaced all usages in salt/modules/: status, rpm_lowpkg, dpkg_lowpkg, aptpkg
- Fixed test file: tests/pytests/unit/states/file/test_tidied.py
- Removed unused datetime imports
3. Fix boto3 test collection error on Windows
- tests/unit/utils/test_boto3mod.py was accessing boto3.__version__
even when boto3 not installed, causing NameError
- Added HAS_BOTO3 check to version comparison skipif decorator
Use grains.get() with default value of 0 instead of direct dictionary access to handle cases where osmajorrelease grain is not available. Fixes test_owner and test_which failures on systems without osmajorrelease.
Ensure VirtualEnv test helper uses pip>=23.2 on Python 3.12+ to avoid distutils import errors. Old pip versions try to import the distutils module which was removed in Python 3.12. This fixes test_pip_installed_pkgs_test_mode and other virtualenv-based tests that were failing with "ModuleNotFoundError: No module named 'distutils'".
The legacy git code path in winrepo.update_git_repos() was storing result["result"] (a boolean) instead of the target directory path. This caused tests to fail with AttributeError when calling .endswith() on the boolean value. Changed to store gittarget (the actual path) to match the behavior of the non-legacy gitfs code and what tests expect. Fixes test_update_git_repos when GitPython/Pygit2 are not installed.
The backports module is not available in Python 3.12+ environments, even though sys.version_info < (3, 13) evaluates to True. The test was expecting backports to be included in thin.get_tops() output based solely on Python version, but salt/utils/thin.py correctly sets backports=None when the import fails. Fixed by checking salt.utils.thin.backports is not None instead of sys.version_info < (3, 13), matching the pattern used for has_immutables. Fixes test_get_tops, test_get_tops_extra_mods, and test_get_tops_so_mods on Python 3.12.
- Update noxfile and requirements for Python 3.12 (multidict, timelib) - Patch TestAccount and sshd_server to skip when privileges/binaries are missing - Fix masterapi KeyError in minion_publish - Resolve test environment crashes in test_config.py and test_saltcheck.py - Align multidict version across all static requirement files
- Update test_pip.py to handle dynamic extras paths (extras-3.12) - Fix path-list handling in extras_pypath fixture - Add skipif for setproctitle check when C-extension is non-functional
- Replace os.getuid() with a cross-platform check using salt.utils.platform.is_windows() - Ensure extras-3.12 path is correctly constructed on all platforms
…tests - tests/pytests/functional/states/test_pip_state.py: Use Python 3.12 compatible pip versions and direct download links. - salt/utils/thin.py: Use consistent package names in saltext discovery to fix blocklist logic. - tests/conftest.py: Ensure SSH fixtures skip early when sshd is missing and synchronized scopes. - tests/unit/modules/test_saltcheck.py: Improve mock flexibility for dynamic command calls. - tests/pytests/unit/beacons/test_log_beacon.py: Safe TRACE log level access. - tests/pytests/unit/client/ssh/test_single.py: Capture log messages regardless of global level. - requirements/static: Regenerated and aligned multidict==6.1.0 repository-wide.
- tests/conftest.py: Change sshd_config_dir scope to session to match its usage in the bridge_pytest_and_runtests session-scoped autouse fixture. Ensure that missing sshd binary only yields None instead of skipping the entire test session. - tests/pytests/unit/client/ssh/test_single.py: Update log capture to use level 5 (TRACE) to properly intercept the log.trace messages in run_ssh_pre_flight tests.
- Handle RuntimeError with 'Event loop is closed' in AsyncReqMessageClient, RequestServer, and PublishServer coroutines in salt/transport/zeromq.py. - Handle similar RuntimeError in LoadBalancerWorker in salt/transport/tcp.py. - Filter dateutil's deprecated datetime calls in salt/__init__.py to prevent ResourceWarning/DeprecationWarning from breaking tests in Python 3.12.
- Introduce get_event_loop() and get_ioloop() helpers in salt/utils/asynchronous.py to safely retrieve or create event loops without triggering DeprecationWarnings. - Replace direct tornado.ioloop.IOLoop.current() calls with salt.utils.asynchronous.get_ioloop() in salt/crypt.py, salt/channel/client.py, salt/minion.py, salt/utils/event.py, salt/transport/ws.py, salt/transport/tcp.py, and salt/transport/zeromq.py. - Remove unused tornado imports in salt/channel/client.py.
- salt/states/ssh_auth.py: Improve sshre regex to handle optional comments correctly. - salt/states/ssh_auth.py: Refactor manage state to properly parse each key in ssh_keys using the improved regex, ensuring correct identification for removal and presence checks. - tests/pytests/functional/states/test_ssh_auth.py: Update test to use a valid RSA key and get_ioloop() helper for Python 3.12 compatibility.
- salt/utils/asynchronous.py: Simplify get_event_loop() and get_ioloop() to completely avoid DeprecationWarnings in Python 3.12 by directly creating/setting loops if none are running. - salt/utils/asynchronous.py: Ensure SyncWrapper._target uses the instance s io_loop to avoid hangs due to mismatched loops in background threads. - tests/pytests/functional/transport/zeromq/test_request_client.py: Fix spelling of Receive in test assertions to match code.
- salt/transport/ipc.py: Use salt.utils.asynchronous.get_ioloop() instead of direct tornado calls. Wrap IOStream creation in current_ioloop context to ensure correct binding. - salt/utils/event.py: Bump deprecation version for EventPublisher to 3009. - salt/utils/asynchronous.py: Further refine get_event_loop and get_ioloop to suppress DeprecationWarnings and ensure SyncWrapper uses the correct loop. - tests/unit/transport/test_ipc.py: Fix thread synchronization by calling self.stop() via add_callback.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
What issues does this PR fix or reference?
Fixes
Previous Behavior
Remove this section if not relevant
New Behavior
Remove this section if not relevant
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No