Skip to content

Commit e22b89d

Browse files
committed
Sort fact kwargs in operation tests.
1 parent a948ace commit e22b89d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+46
-46
lines changed

pyinfra/api/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get_kwargs_str(kwargs):
4343

4444
items = [
4545
'{0}={1}'.format(key, value)
46-
for key, value in kwargs.items()
46+
for key, value in sorted(kwargs.items())
4747
if key not in ('self', 'state', 'host')
4848
]
4949
return ', '.join(items)

tests/operations/mysql.database/add.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"facts": {
88
"mysql.MysqlDatabases": {
9-
"mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
9+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
1010
}
1111
},
1212
"commands": [

tests/operations/mysql.database/add_noop.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"args": ["somedb"],
33
"facts": {
44
"mysql.MysqlDatabases": {
5-
"mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
5+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
66
"somedb": {}
77
}
88
}

tests/operations/mysql.database/add_privileges.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
},
77
"facts": {
88
"mysql.MysqlDatabases": {
9-
"mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
9+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
1010
},
1111
"mysql.MysqlUserGrants": {
12-
"user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
12+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
1313
"localhost": {}
1414
}
1515
}

tests/operations/mysql.database/delete.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"facts": {
77
"mysql.MysqlDatabases": {
8-
"mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
8+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {
99
"somedb": {}
1010
}
1111
}

tests/operations/mysql.database/delete_noop.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"facts": {
77
"mysql.MysqlDatabases": {
8-
"mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
8+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None": {}
99
}
1010
},
1111
"commands": [],

tests/operations/mysql.privileges/add.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"args": ["someuser", ["SELECT", "INSERT", "DELETE"]],
33
"facts": {
44
"mysql.MysqlUserGrants": {
5-
"user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
5+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
66
"*.*": {
77
"privileges": ["DELETE"]
88
}

tests/operations/mysql.privileges/add_database.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"facts": {
77
"mysql.MysqlUserGrants": {
8-
"user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
8+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
99
"*.*": {
1010
"privileges": []
1111
}

tests/operations/mysql.privileges/add_existing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"args": ["someuser", ["SELECT", "INSERT"]],
33
"facts": {
44
"mysql.MysqlUserGrants": {
5-
"user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
5+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
66
"*.*": {
77
"privileges": ["SELECT", "INSERT"]
88
}

tests/operations/mysql.privileges/add_table.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"facts": {
88
"mysql.MysqlUserGrants": {
9-
"user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
9+
"mysql_host=None, mysql_password=None, mysql_port=None, mysql_user=None, user=someuser, user_hostname=localhost": {
1010
"*.*": {
1111
"privileges": []
1212
}

0 commit comments

Comments
 (0)