From 9ee079f34de125db31268c33cfe38ab4855ea3b5 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Mon, 29 Jan 2018 07:02:31 +1000 Subject: [PATCH] further fixes to rename only where required (#35432) --- test/units/modules/network/dellos10/dellos10_module.py | 3 --- ...em_semicolon_ => show_processes_node-id_1__grep_Mem_colon_} | 0 test/units/modules/network/dellos10/test_dellos10_facts.py | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) rename test/units/modules/network/dellos10/fixtures/{show_processes_node-id_1__grep_Mem_semicolon_ => show_processes_node-id_1__grep_Mem_colon_} (100%) diff --git a/test/units/modules/network/dellos10/dellos10_module.py b/test/units/modules/network/dellos10/dellos10_module.py index 30f048c08b1..4521bb2e381 100644 --- a/test/units/modules/network/dellos10/dellos10_module.py +++ b/test/units/modules/network/dellos10/dellos10_module.py @@ -32,9 +32,6 @@ fixture_data = {} def load_fixture(name): - # convert illegal filenames (both unix and windows to another char) - name = name.replace(':', '_semicolon_') - path = os.path.join(fixture_path, name) if path in fixture_data: diff --git a/test/units/modules/network/dellos10/fixtures/show_processes_node-id_1__grep_Mem_semicolon_ b/test/units/modules/network/dellos10/fixtures/show_processes_node-id_1__grep_Mem_colon_ similarity index 100% rename from test/units/modules/network/dellos10/fixtures/show_processes_node-id_1__grep_Mem_semicolon_ rename to test/units/modules/network/dellos10/fixtures/show_processes_node-id_1__grep_Mem_colon_ diff --git a/test/units/modules/network/dellos10/test_dellos10_facts.py b/test/units/modules/network/dellos10/test_dellos10_facts.py index 57f4f545609..3b1dd9599aa 100644 --- a/test/units/modules/network/dellos10/test_dellos10_facts.py +++ b/test/units/modules/network/dellos10/test_dellos10_facts.py @@ -61,6 +61,7 @@ class TestDellos10Facts(TestDellos10Module): command = str(command).replace('|', '') filename = str(command).replace(' ', '_') filename = filename.replace('/', '7') + filename = filename.replace(':', '_colon_') output.append(load_fixture(filename)) return output