From 20a9b4fff3101fe18f0b439c12d40f1c1f126318 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 4 Apr 2019 16:20:51 -0700 Subject: [PATCH] Only use repos with valid urls for test_server.py libdnf-0.22.5-5 changed something and now the repos with fake urls are failing when loaded by test_server.py (they still work fine with test_projects.py) so only use the 'good' repos with the test_server.py tests -- the others weren't needed for any of its tests anyway. Related: rhbz#1678937 --- tests/pylorax/repos/{multiple.repo => server-1.repo} | 0 tests/pylorax/repos/{single.repo => server-2.repo} | 0 tests/pylorax/repos/{other.repo => server-3.repo} | 0 tests/pylorax/test_server.py | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename tests/pylorax/repos/{multiple.repo => server-1.repo} (100%) rename tests/pylorax/repos/{single.repo => server-2.repo} (100%) rename tests/pylorax/repos/{other.repo => server-3.repo} (100%) diff --git a/tests/pylorax/repos/multiple.repo b/tests/pylorax/repos/server-1.repo similarity index 100% rename from tests/pylorax/repos/multiple.repo rename to tests/pylorax/repos/server-1.repo diff --git a/tests/pylorax/repos/single.repo b/tests/pylorax/repos/server-2.repo similarity index 100% rename from tests/pylorax/repos/single.repo rename to tests/pylorax/repos/server-2.repo diff --git a/tests/pylorax/repos/other.repo b/tests/pylorax/repos/server-3.repo similarity index 100% rename from tests/pylorax/repos/other.repo rename to tests/pylorax/repos/server-3.repo diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index bc6bbb56..d07a895e 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -103,9 +103,9 @@ class ServerTestCase(unittest.TestCase): make_dnf_dirs(server.config["COMPOSER_CFG"]) - # copy over the test dnf repositories + # copy over the test_server dnf repositories dnf_repo_dir = server.config["COMPOSER_CFG"].get("composer", "repo_dir") - for f in glob("./tests/pylorax/repos/*.repo"): + for f in glob("./tests/pylorax/repos/server-*.repo"): shutil.copy2(f, dnf_repo_dir) # Modify fedora vs. rawhide tests when running on rawhide