Sort fact kwargs in operation tests.

pyinfra-dev · Oct 15, 2021 · e22b89d · e22b89d
1 parent a948ace
commit e22b89d
Show file tree

Hide file tree

Showing 44 changed files with 46 additions and 46 deletions.
diff --git a/pyinfra/api/util.py b/pyinfra/api/util.py
@@ -43,7 +43,7 @@ def get_kwargs_str(kwargs):
 
     items = [
         '{0}={1}'.format(key, value)
-        for key, value in kwargs.items()
+        for key, value in sorted(kwargs.items())
         if key not in ('self', 'state', 'host')
     ]
     return ', '.join(items)

diff --git a/tests/operations/mysql.database/add.json b/tests/operations/mysql.database/add.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlDatabases": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.database/add_noop.json b/tests/operations/mysql.database/add_noop.json
@@ -2,7 +2,7 @@
     "args": ["somedb"],
     "facts": {
         "mysql.MysqlDatabases": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "somedb": {}
             }
         }

diff --git a/tests/operations/mysql.database/add_privileges.json b/tests/operations/mysql.database/add_privileges.json
@@ -6,10 +6,10 @@
     },
     "facts": {
         "mysql.MysqlDatabases": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         },
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "localhost": {}
             }
         }

diff --git a/tests/operations/mysql.database/delete.json b/tests/operations/mysql.database/delete.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlDatabases": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "somedb": {}
             }
         }

diff --git a/tests/operations/mysql.database/delete_noop.json b/tests/operations/mysql.database/delete_noop.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlDatabases": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [],

diff --git a/tests/operations/mysql.privileges/add.json b/tests/operations/mysql.privileges/add.json
@@ -2,7 +2,7 @@
     "args": ["someuser", ["SELECT", "INSERT", "DELETE"]],
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": ["DELETE"]
                 }

diff --git a/tests/operations/mysql.privileges/add_database.json b/tests/operations/mysql.privileges/add_database.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": []
                 }

diff --git a/tests/operations/mysql.privileges/add_existing.json b/tests/operations/mysql.privileges/add_existing.json
@@ -2,7 +2,7 @@
     "args": ["someuser", ["SELECT", "INSERT"]],
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": ["SELECT", "INSERT"]
                 }

diff --git a/tests/operations/mysql.privileges/add_table.json b/tests/operations/mysql.privileges/add_table.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": []
                 }

diff --git a/tests/operations/mysql.privileges/add_table_invalid.json b/tests/operations/mysql.privileges/add_table_invalid.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": []
                 }

diff --git a/tests/operations/mysql.privileges/add_with_grant_option.json b/tests/operations/mysql.privileges/add_with_grant_option.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": []
                 }

diff --git a/tests/operations/mysql.privileges/delete.json b/tests/operations/mysql.privileges/delete.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": ["SELECT", "INSERT"]
                 }

diff --git a/tests/operations/mysql.privileges/delete_with_grant_option.json b/tests/operations/mysql.privileges/delete_with_grant_option.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": ["SELECT", "GRANT OPTION"]
                 }

diff --git a/tests/operations/mysql.privileges/remove_noop.json b/tests/operations/mysql.privileges/remove_noop.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
                 "*.*": {
                     "privileges": []
                 }

diff --git a/tests/operations/mysql.user/add.json b/tests/operations/mysql.user/add.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_noop.json b/tests/operations/mysql.user/add_noop.json
@@ -2,7 +2,7 @@
     "args": ["someuser"],
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {}
             }
         }

diff --git a/tests/operations/mysql.user/add_password.json b/tests/operations/mysql.user/add_password.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_privileges.json b/tests/operations/mysql.user/add_privileges.json
@@ -6,10 +6,10 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         },
         "mysql.MysqlUserGrants": {
-            "user=someuser, user_hostname=localwhat, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localwhat": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_resources.json b/tests/operations/mysql.user/add_resources.json
@@ -9,7 +9,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_ssl.json b/tests/operations/mysql.user/add_ssl.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_x509.json b/tests/operations/mysql.user/add_x509.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/add_x509_specified.json b/tests/operations/mysql.user/add_x509_specified.json
@@ -9,7 +9,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/mysql.user/delete.json b/tests/operations/mysql.user/delete.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localwhat": {}
             }
         }

diff --git a/tests/operations/mysql.user/remove_noop.json b/tests/operations/mysql.user/remove_noop.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
         }
     },
     "commands": [],

diff --git a/tests/operations/mysql.user/update_resources.json b/tests/operations/mysql.user/update_resources.json
@@ -8,7 +8,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "max_user_connections": 0,
                     "max_questions": 0,

diff --git a/tests/operations/mysql.user/update_resources_partial.json b/tests/operations/mysql.user/update_resources_partial.json
@@ -8,7 +8,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "max_user_connections": 500,
                     "max_questions": 0,

diff --git a/tests/operations/mysql.user/update_ssl.json b/tests/operations/mysql.user/update_ssl.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "ssl_type": null
                 }

diff --git a/tests/operations/mysql.user/update_x509.json b/tests/operations/mysql.user/update_x509.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "ssl_type": null
                 }

diff --git a/tests/operations/mysql.user/update_x509_specified.json b/tests/operations/mysql.user/update_x509_specified.json
@@ -8,7 +8,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "ssl_cipher": null,
                     "x509_issuer": null,

diff --git a/tests/operations/mysql.user/update_x509_specified_partial.json b/tests/operations/mysql.user/update_x509_specified_partial.json
@@ -8,7 +8,7 @@
     },
     "facts": {
         "mysql.MysqlUsers": {
-            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+            "mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
                 "someuser@localhost": {
                     "ssl_cipher": "a-cipher",
                     "x509_issuer": null,

diff --git a/tests/operations/postgresql.database/add_database.json b/tests/operations/postgresql.database/add_database.json
@@ -2,7 +2,7 @@
     "args": ["somedb"],
     "facts" :{
         "postgresql.PostgresqlDatabases": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.database/add_database_noop.json b/tests/operations/postgresql.database/add_database_noop.json
@@ -2,7 +2,7 @@
     "args": ["somedb"],
     "facts" :{
         "postgresql.PostgresqlDatabases": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {
                 "somedb": {}
             }
         }

diff --git a/tests/operations/postgresql.database/add_database_owner.json b/tests/operations/postgresql.database/add_database_owner.json
@@ -5,7 +5,7 @@
     },
     "facts" :{
         "postgresql.PostgresqlDatabases": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.database/remove_database.json b/tests/operations/postgresql.database/remove_database.json
@@ -5,7 +5,7 @@
     },
     "facts" :{
         "postgresql.PostgresqlDatabases": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {
                 "somedb": {}
             }
         }

diff --git a/tests/operations/postgresql.database/remove_database_noop.json b/tests/operations/postgresql.database/remove_database_noop.json
@@ -5,7 +5,7 @@
     },
     "facts" :{
         "postgresql.PostgresqlDatabases": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [],

diff --git a/tests/operations/postgresql.role/role_add_noop.json b/tests/operations/postgresql.role/role_add_noop.json
@@ -2,7 +2,7 @@
     "args": ["testuser"],
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {
                 "testuser": {}
             }
         }

diff --git a/tests/operations/postgresql.role/role_remove_noop.json b/tests/operations/postgresql.role/role_remove_noop.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [],

diff --git a/tests/operations/postgresql.role/user_add.json b/tests/operations/postgresql.role/user_add.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.role/user_add_no_login.json b/tests/operations/postgresql.role/user_add_no_login.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.role/user_add_privileges.json b/tests/operations/postgresql.role/user_add_privileges.json
@@ -8,7 +8,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.role/user_add_replication.json b/tests/operations/postgresql.role/user_add_replication.json
@@ -6,7 +6,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [

diff --git a/tests/operations/postgresql.role/user_add_super.json b/tests/operations/postgresql.role/user_add_super.json
@@ -5,7 +5,7 @@
     },
     "facts": {
         "postgresql.PostgresqlRoles": {
-            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+            "postgresql_host=None, postgresql_password=None, postgresql_port=None, postgresql_user=None": {}
         }
     },
     "commands": [