Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merge forward 3006.x into 3007.x #68447

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

Open
wants to merge 27 commits into
base: 3007.x
Choose a base branch
from
+3,197 −2,432
Open

Merge forward 3006.x into 3007.x #68447

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
45c7cef
fix(debian-ip): include all mapped options as valid options
perhallgren Sep 30, 2025
dc54ee1
test(debian-ip): add tests for all valid_opts
perhallgren Sep 30, 2025
f2be357
Allow libgit2 to guess sysdir homedir successfully
meaksh Oct 3, 2025
5555032
Fix pygit2 unit test to check HOME is injected
meaksh Oct 3, 2025
c1c30de
Add changelog entry
meaksh Oct 3, 2025
07bbb95
Move import statement to the beginning of the file
meaksh Oct 13, 2025
0874155
tools downloads both windows packages
dwoz Aug 19, 2025
cf1ad2e
salt-ssh now supports `state.sls_exists`
dwoz Oct 22, 2025
ec24c1b
Update filename_map.yml due to test migration
dwoz Oct 22, 2025
b5b93c2
Migrate salt.utils.thin unit tests to pytest
dwoz Oct 25, 2025
ab6dc9d
Upgrade relenv
dwoz Oct 30, 2025
a3b2067
Deprecate salt.utils.odict
dwoz Oct 30, 2025
c7220a7
Fix missing import
dwoz Oct 30, 2025
bad3aa6
Add regression test for SaltMessageServer unpacker leak
dwoz Oct 27, 2025
5557173
!fixup 2275ba3d
OrangeDog Oct 15, 2025
50b0593
Fix msgpack leak in tcp.py
OrangeDog Oct 15, 2025
f74b264
Each stream should have it's own unpacker
dwoz Oct 27, 2025
bc9dc52
Add changelog for 68394
dwoz Oct 27, 2025
9077847
Ensure there are no lingering clients
dwoz Oct 28, 2025
0c34b0e
Fix rpm pkg warnings and remove fallback to slow process fork
bdrx312 Oct 18, 2025
83f22b3
Don't remove ensurepip during package cleanup
twangboy Oct 31, 2025
a73481f
Merge branch '3006.x' into merge/3007.x/3006.x-25-11-03
dwoz Nov 3, 2025
2799671
Do not raise import errors if backports module is missing
dwoz Nov 4, 2025
76571fa
Fix pre-commt issues
dwoz Nov 4, 2025
bafb949
Use macos-15-intel instead of macos-13
dwoz Nov 4, 2025
4e1749d
Fix merge wart causing test to fail
dwoz Nov 5, 2025
95bc2e7
Use immutables==0.21 everywhere
dwoz Nov 5, 2025
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
Prev Previous commit
Next Next commit
test(debian-ip): add tests for all valid_opts 
Tests that all mapped options are also in valid_opts.
  • Loading branch information
@perhallgren @dwoz
perhallgren authored and dwoz committed Oct 28, 2025
commit dc54ee1882ff5678b8f1f4875ab4fe67b5965f42
55 changes: 55 additions & 0 deletions tests/pytests/unit/modules/test_debian_ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,61 @@ def test_interfaces():
' gateway 2001:db8:dead:beef::1\n',
' accept_ra 2\n',
'\n']},

# Command hooks
{'iface_name': 'eth_optmap_test', 'iface_type': 'eth', 'enabled': True,
'build_interface': {
'proto': 'manual',
'up_cmds': ['echo "interface up"'],
'down_cmds': ['echo "interface down"'],
'pre_up_cmds': ['echo "pre-up"'],
'post_up_cmds': ['echo "post-up"'],
'pre_down_cmds': ['echo "pre-down"'],
'post_down_cmds': ['echo "post-down"'],
},
'get_interface': odict([('eth_optmap_test', odict([('enabled', True), ('data', odict([
('inet', odict([
('addrfam', 'inet'),
('proto', 'manual'),
('filename', None),
('up_cmds', ['echo "interface up"']),
('down_cmds', ['echo "interface down"']),
('pre_up_cmds', ['echo "pre-up"']),
('post_up_cmds', ['echo "post-up"']),
('pre_down_cmds', ['echo "pre-down"']),
('post_down_cmds', ['echo "post-down"']),
])),
]))]))]),
'return': [
'auto eth_optmap_test\n',
'iface eth_optmap_test inet manual\n',
' up echo "interface up"\n',
' down echo "interface down"\n',
' pre-up echo "pre-up"\n',
' post-up echo "post-up"\n',
' pre-down echo "pre-down"\n',
' post-down echo "post-down"\n',
'\n']},

# hwaddr should map to hwaddress
{'iface_name': 'eth_hwaddr_test', 'iface_type': 'eth', 'enabled': True,
'build_interface': {
'proto': 'manual',
'hwaddr': '00:11:22:33:44:55',
},
'get_interface': odict([('eth_hwaddr_test', odict([('enabled', True), ('data', odict([
('inet', odict([
('addrfam', 'inet'),
('proto', 'manual'),
('filename', None),
('hwaddress', '00:11:22:33:44:55'),
])),
]))]))]),
'return': [
'auto eth_hwaddr_test\n',
'iface eth_hwaddr_test inet manual\n',
' hwaddress 00:11:22:33:44:55\n',
'\n']},
]
# fmt: on

Expand Down