mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-28 14:39:07 +00:00
batch 2 - update Python idiom to 3.7 using pyupgrade (#11342)
* batch 2 - update Python idiom to 3.7 using pyupgrade * Apply suggestions from code review
This commit is contained in:
parent
9e363c9f94
commit
266d9d3fb0
19 changed files with 64 additions and 70 deletions
|
|
@ -34,13 +34,13 @@ def inventory():
|
|||
|
||||
|
||||
def load_txt_data(path):
|
||||
with open(path, "r") as f:
|
||||
with open(path) as f:
|
||||
s = f.read()
|
||||
return s
|
||||
|
||||
|
||||
def load_yml_data(path):
|
||||
with open(path, "r") as f:
|
||||
with open(path) as f:
|
||||
d = yaml.safe_load(f)
|
||||
return d
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ def test_verify_file_bad_config(inventory):
|
|||
|
||||
|
||||
def get_vm_pool_json():
|
||||
with open("tests/unit/plugins/inventory/fixtures/opennebula_inventory.json", "r") as json_file:
|
||||
with open("tests/unit/plugins/inventory/fixtures/opennebula_inventory.json") as json_file:
|
||||
jsondata = json.load(json_file)
|
||||
|
||||
data = type("pyone.bindings.VM_POOLSub", (object,), {"VM": []})()
|
||||
|
|
@ -349,15 +349,13 @@ keyed_groups:
|
|||
# note the vm_pool (and json data file) has four hosts,
|
||||
# but the options above asks ansible to filter one out
|
||||
assert len(get_vm_pool_json().VM) == 4
|
||||
assert set(vm.NAME for vm in get_vm_pool_json().VM) == set(
|
||||
[
|
||||
"terraform_demo_00",
|
||||
"terraform_demo_01",
|
||||
"terraform_demo_srv_00",
|
||||
"bs-windows",
|
||||
]
|
||||
)
|
||||
assert set(im._inventory.hosts) == set(["terraform_demo_00", "terraform_demo_01", "terraform_demo_srv_00"])
|
||||
assert {vm.NAME for vm in get_vm_pool_json().VM} == {
|
||||
"terraform_demo_00",
|
||||
"terraform_demo_01",
|
||||
"terraform_demo_srv_00",
|
||||
"bs-windows",
|
||||
}
|
||||
assert set(im._inventory.hosts) == {"terraform_demo_00", "terraform_demo_01", "terraform_demo_srv_00"}
|
||||
|
||||
host_demo00 = im._inventory.get_host("terraform_demo_00")
|
||||
host_demo01 = im._inventory.get_host("terraform_demo_01")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue