From b70ed9a60d8be8f2cb439fac4095edb605f6017a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Thu, 10 Jun 2021 12:45:39 +0200 Subject: [PATCH] Rename fixtures (#2946) * Rename fixtures * Use tilde --- tests/conftest.py | 4 ++-- ...*.xml => org_freedesktop_NetworkManager_AccessPoint_~.xml} | 0 ... => org_freedesktop_NetworkManager_ActiveConnection_~.xml} | 0 ...ces_*.xml => org_freedesktop_NetworkManager_Devices_~.xml} | 0 ...g_*.xml => org_freedesktop_NetworkManager_IP4Config_~.xml} | 0 ...g_*.xml => org_freedesktop_NetworkManager_IP6Config_~.xml} | 0 ...gs_*.xml => org_freedesktop_NetworkManager_Settings_~.xml} | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename tests/fixtures/{org_freedesktop_NetworkManager_AccessPoint_*.xml => org_freedesktop_NetworkManager_AccessPoint_~.xml} (100%) rename tests/fixtures/{org_freedesktop_NetworkManager_ActiveConnection_*.xml => org_freedesktop_NetworkManager_ActiveConnection_~.xml} (100%) rename tests/fixtures/{org_freedesktop_NetworkManager_Devices_*.xml => org_freedesktop_NetworkManager_Devices_~.xml} (100%) rename tests/fixtures/{org_freedesktop_NetworkManager_IP4Config_*.xml => org_freedesktop_NetworkManager_IP4Config_~.xml} (100%) rename tests/fixtures/{org_freedesktop_NetworkManager_IP6Config_*.xml => org_freedesktop_NetworkManager_IP6Config_~.xml} (100%) rename tests/fixtures/{org_freedesktop_NetworkManager_Settings_*.xml => org_freedesktop_NetworkManager_Settings_~.xml} (100%) diff --git a/tests/conftest.py b/tests/conftest.py index 7dd93ce8c..e863ed970 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -89,8 +89,8 @@ def dbus() -> DBus: fixture = re.sub(r"_[0-9]+$", "", fixture) # special case - if exists_fixture(f"{fixture}_*.{filetype}"): - fixture = f"{fixture}_*" + if exists_fixture(f"{fixture}_~.{filetype}"): + fixture = f"{fixture}_~" else: fixture = f"{fixture}-{command[10].split('.')[-1]}" filetype = "fixture" diff --git a/tests/fixtures/org_freedesktop_NetworkManager_AccessPoint_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_AccessPoint_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_AccessPoint_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_AccessPoint_~.xml diff --git a/tests/fixtures/org_freedesktop_NetworkManager_ActiveConnection_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_ActiveConnection_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_ActiveConnection_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_ActiveConnection_~.xml diff --git a/tests/fixtures/org_freedesktop_NetworkManager_Devices_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_Devices_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_Devices_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_Devices_~.xml diff --git a/tests/fixtures/org_freedesktop_NetworkManager_IP4Config_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_IP4Config_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_IP4Config_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_IP4Config_~.xml diff --git a/tests/fixtures/org_freedesktop_NetworkManager_IP6Config_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_IP6Config_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_IP6Config_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_IP6Config_~.xml diff --git a/tests/fixtures/org_freedesktop_NetworkManager_Settings_*.xml b/tests/fixtures/org_freedesktop_NetworkManager_Settings_~.xml similarity index 100% rename from tests/fixtures/org_freedesktop_NetworkManager_Settings_*.xml rename to tests/fixtures/org_freedesktop_NetworkManager_Settings_~.xml