diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 194ecd5ea659..23de2805a862 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -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 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 79c22d805d79..63c8409ea2e9 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 00168f1e8414..249c9db27f96 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index effbea2f517f..b43ace19bdba 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index bbf7ceb5edf3..c7bb9ede2399 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index d286f61c4e48..979f1f444be4 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.6/cloud.txt b/requirements/static/ci/py3.6/cloud.txt index 77c9554b2fd7..a1fdda2018ea 100644 --- a/requirements/static/ci/py3.6/cloud.txt +++ b/requirements/static/ci/py3.6/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.6/linux.txt b/requirements/static/ci/py3.6/linux.txt index 64c92afed805..37394b19a5a1 100644 --- a/requirements/static/ci/py3.6/linux.txt +++ b/requirements/static/ci/py3.6/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index ce2450378178..c3b056e31b20 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index b09ed457bd6f..3eb31408172d 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index f161e3ec8c80..534fb88d7fec 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index eb67d32fc9d0..03c8e5477f80 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index d4fe6b114e81..7031a836d50d 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 47cd8821052d..9bff2aeea531 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 6a88644cf27f..794fc847177d 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index a8f9ebe5477a..0a657ac45ff0 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 21ce4479a1c5..84d4b5402ee4 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 899777449b19..160dfc07443d 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 08684555f86a..0c8f8168e184 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index d96a0590e90d..79eed0fb31a8 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index f7b58cf82845..d113afd1fb24 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -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 diff --git a/tests/pytests/functional/states/test_mysql.py b/tests/pytests/functional/states/test_mysql.py index 89eb339408d3..355f2cc1ebaa 100644 --- a/tests/pytests/functional/states/test_mysql.py +++ b/tests/pytests/functional/states/test_mysql.py @@ -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" )