Skip to content
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

Jump to bottom

Bump to pytest-salt-factories==1.0.0rc21 #63017

Merged
merged 1 commit into from
Nov 7, 2022
+26 −28
Merged

Bump to pytest-salt-factories==1.0.0rc21 #63017

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions requirements/pytest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ mock >= 3.0.0
# PyTest
pytest >= 6.1.0; python_version < "3.6"
pytest >= 7.0.1; python_version >= "3.6"
pytest-salt-factories >= 1.0.0rc20; sys_platform == 'win32'
pytest-salt-factories[docker] >= 1.0.0rc20; sys_platform != 'win32'
pytest-salt-factories >= 1.0.0rc21; sys_platform == 'win32'
pytest-salt-factories[docker] >= 1.0.0rc21; sys_platform != 'win32'
pytest-tempdir >= 2019.10.12
pytest-helpers-namespace >= 2019.1.8
pytest-subtests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ pyrsistent==0.17.3
# via jsonschema
pytest-helpers-namespace==2019.1.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc17
pytest-salt-factories==1.0.0rc21
# via -r requirements/pytest.txt
pytest-subtests==0.4.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc20 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc20 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
pytest-salt-factories[docker]==1.0.0rc21 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ pytest-helpers-namespace==2021.4.29
# pytest-shell-utilities
pytest-httpserver==1.0.4
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc20 ; sys_platform == "win32"
pytest-salt-factories==1.0.0rc21 ; sys_platform == "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
Expand Down
10 changes: 4 additions & 6 deletions tests/pytests/functional/states/test_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,28 +404,26 @@ def test_grants_present_absent_state_file(

try:
with pytest.helpers.temp_file("manage_mysql.sls", content, state_tree):
ret = modules.state.apply(
"manage_mysql",
)
ret = modules.state.apply("manage_mysql")

# Check user creation
state = "mysql_user_|-sbclient_2_0_|-sbclient_2_0_|-present"
assert state in ret
assert "changes" in ret[state]
assert ret[state]["changes"] == {"sbclient_2_0": "Present"}
assert ret[state].changes == {"sbclient_2_0": "Present"}

# Check database creation
state = "mysql_database_|-sbclient_2_0_|-sbclient_2_0_|-present"
assert state in ret
assert "changes" in ret[state]
assert ret[state]["changes"] == {"sbclient_2_0": "Present"}
assert ret[state].changes == {"sbclient_2_0": "Present"}

# Check grant creation
state = "mysql_grants_|-sbclient_2_0_|-sbclient_2_0_|-present"
assert state in ret
assert "comment" in ret[state]
assert (
ret[state]["comment"]
ret[state].comment
== "Grant ALL PRIVILEGES on sbclient_2_0.* to sbclient_2_0@localhost has been added"
)

Expand Down