File fix_failing_cobbler_tests.patch of Package cobbler
Index: cobbler-3.3.3/setup.py
===================================================================
--- cobbler-3.3.3.orig/setup.py
+++ cobbler-3.3.3/setup.py
@@ -699,10 +699,47 @@ if __name__ == "__main__":
("%s/man1" % docpath, glob("build/sphinx/man/*.1")),
("%s/man5" % docpath, glob("build/sphinx/man/*.5")),
("%s/man8" % docpath, glob("build/sphinx/man/*.8")),
+ # tests
("%s/tests" % datadir, glob("tests/*.py")),
+ ("%s/tests/actions" % datadir, glob("tests/actions/*.py")),
+ ("%s/tests/actions/buildiso" % datadir, glob("tests/actions/buildiso/*.py")),
+ ("%s/tests/api" % datadir, glob("tests/api/*.py")),
("%s/tests/cli" % datadir, glob("tests/cli/*.py")),
+ ("%s/tests/collections" % datadir, glob("tests/collections/*.py")),
+ ("%s/tests/items" % datadir, glob("tests/items/*.py")),
("%s/tests/modules" % datadir, glob("tests/modules/*.py")),
("%s/tests/modules/authentication" % datadir, glob("tests/modules/authentication/*.py")),
+ ("%s/tests/modules/authorization" % datadir, glob("tests/modules/authorization/*.py")),
+ ("%s/tests/modules/installation" % datadir, glob("tests/modules/installation/*.py")),
+ ("%s/tests/modules/managers" % datadir, glob("tests/modules/managers/*.py")),
+ ("%s/tests/modules/serializer" % datadir, glob("tests/modules/serializer/*.py")),
+ ("%s/tests/settings" % datadir, glob("tests/settings/*.py")),
+ ("%s/tests/settings/migrations" % datadir, glob("tests/settings/migrations/*.py")),
+ ("%s/tests/special_cases" % datadir, glob("tests/special_cases/*.py")),
+ ("%s/tests/test_data" % datadir, glob("tests/test_data/*")),
+ ("%s/tests/test_data/V2_8_5" % datadir, glob("tests/test_data/V2_8_5/*")),
+ ("%s/tests/test_data/V3_0_0" % datadir, glob("tests/test_data/V3_0_0/*")),
+ ("%s/tests/test_data/V3_0_0/settings.d" % datadir, glob("tests/test_data/V3_0_0/settings.d/*")),
+ ("%s/tests/test_data/V3_0_1" % datadir, glob("tests/test_data/V3_0_1/*")),
+ ("%s/tests/test_data/V3_0_1/settings.d" % datadir, glob("tests/test_data/V3_0_1/settings.d/*")),
+ ("%s/tests/test_data/V3_1_0" % datadir, glob("tests/test_data/V3_1_0/*")),
+ ("%s/tests/test_data/V3_1_0/settings.d" % datadir, glob("tests/test_data/V3_1_0/settings.d/*")),
+ ("%s/tests/test_data/V3_1_1" % datadir, glob("tests/test_data/V3_1_1/*")),
+ ("%s/tests/test_data/V3_1_1/settings.d" % datadir, glob("tests/test_data/V3_1_1/settings.d/*")),
+ ("%s/tests/test_data/V3_1_2" % datadir, glob("tests/test_data/V3_1_2/*")),
+ ("%s/tests/test_data/V3_1_2/settings.d" % datadir, glob("tests/test_data/V3_1_2/settings.d/*")),
+ ("%s/tests/test_data/V3_2_0" % datadir, glob("tests/test_data/V3_2_0/*")),
+ ("%s/tests/test_data/V3_2_0/settings.d" % datadir, glob("tests/test_data/V3_2_0/settings.d/*")),
+ ("%s/tests/test_data/V3_2_1" % datadir, glob("tests/test_data/V3_2_1/*")),
+ ("%s/tests/test_data/V3_2_1/settings.d" % datadir, glob("tests/test_data/V3_2_1/settings.d/*")),
+ ("%s/tests/test_data/V3_3_0" % datadir, glob("tests/test_data/V3_3_0/*")),
+ ("%s/tests/test_data/V3_3_0/settings.d" % datadir, glob("tests/test_data/V3_3_0/settings.d/*")),
+ ("%s/tests/test_data/V3_3_1" % datadir, glob("tests/test_data/V3_3_1/*")),
+ ("%s/tests/test_data/V3_3_1/settings.d" % datadir, glob("tests/test_data/V3_3_1/settings.d/*")),
+ ("%s/tests/test_data/V3_3_2" % datadir, glob("tests/test_data/V3_3_2/*")),
+ ("%s/tests/test_data/V3_3_2/settings.d" % datadir, glob("tests/test_data/V3_3_2/settings.d/*")),
+ ("%s/tests/test_data/V3_3_3" % datadir, glob("tests/test_data/V3_3_3/*")),
+ ("%s/tests/test_data/V3_3_3/settings.d" % datadir, glob("tests/test_data/V3_3_3/settings.d/*")),
("%s/tests/xmlrpcapi" % datadir, glob("tests/xmlrpcapi/*.py")),
],
)
Index: cobbler-3.3.3/tests/conftest.py
===================================================================
--- cobbler-3.3.3.orig/tests/conftest.py
+++ cobbler-3.3.3/tests/conftest.py
@@ -83,7 +83,7 @@ def create_distro(request, cobbler_api,
def _create_distro():
test_folder = create_kernel_initrd(fk_kernel, fk_initrd)
test_distro = Distro(cobbler_api)
- test_distro.name = request.node.originalname
+ test_distro.name = request.node.originalname if request.node.originalname else request.node.name
test_distro.kernel = os.path.join(test_folder, fk_kernel)
test_distro.initrd = os.path.join(test_folder, fk_initrd)
cobbler_api.add_distro(test_distro)
@@ -101,7 +101,7 @@ def create_profile(request, cobbler_api)
def _create_profile(distro_name):
test_profile = Profile(cobbler_api)
- test_profile.name = request.node.originalname
+ test_profile.name = request.node.originalname if request.node.originalname else request.node.name
test_profile.distro = distro_name
cobbler_api.add_profile(test_profile)
return test_profile
@@ -118,7 +118,7 @@ def create_image(request, cobbler_api):
def _create_image():
test_image = Image(cobbler_api)
- test_image.name = request.node.originalname
+ test_image.name = request.node.originalname if request.node.originalname else request.node.name
cobbler_api.add_image(test_image)
return test_image
@@ -135,7 +135,7 @@ def create_system(request, cobbler_api):
def _create_system(profile_name="", image_name="", name=""):
test_system = System(cobbler_api)
if name == "":
- test_system.name = request.node.originalname
+ test_system.name = request.node.originalname if request.node.originalname else request.node.name
else:
test_system.name = name
if profile_name != "":
@@ -169,7 +169,7 @@ def fk_initrd(request):
:return: A filename as a string.
"""
- return "initrd_%s.img" % request.node.originalname
+ return "initrd_%s.img" % (request.node.originalname if request.node.originalname else request.node.name)
@pytest.fixture(scope="function")
@@ -179,7 +179,7 @@ def fk_kernel(request):
:return: A path as a string.
"""
- return "vmlinuz_%s" % request.node.originalname
+ return "vmlinuz_%s" % (request.node.originalname if request.node.originalname else request.node.name)
@pytest.fixture(scope="function")
Index: cobbler-3.3.3/tests/tftpgen_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/tftpgen_test.py
+++ cobbler-3.3.3/tests/tftpgen_test.py
@@ -44,7 +44,7 @@ def test_copy_single_distro_file(cobbler
generator = tftpgen.TFTPGen(cobbler_api)
# Arrange
- distro_file = "/code/tests/test_data/dummy_initramfs"
+ distro_file = "/usr/share/cobbler/tests/test_data/dummy_initramfs"
distro_dir = "/srv/tftpboot/images/"
symlink_ok = True
initramfs_dst_path = "/srv/tftpboot/images/dummy_initramfs"
Index: cobbler-3.3.3/tests/utils_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/utils_test.py
+++ cobbler-3.3.3/tests/utils_test.py
@@ -259,7 +259,7 @@ def test_blender(cobbler_api):
result = utils.blender(cobbler_api, False, root_item)
# Assert
- assert len(result) == 162
+ assert len(result) == 163
# Must be present because the settings have it
assert "server" in result
# Must be present because it is a field of distro
@@ -392,18 +392,24 @@ def test_os_release():
assert ("suse", 15.2) or ("suse", 15.3) == result
-@pytest.mark.parametrize("test_src,test_dst,expected_result", [
+@pytest.mark.parametrize("test_src,is_symlink,test_dst,expected_result", [
# ("", "", False), --> This has a task in utils.py
- ("/usr/bin/os-release", "/tmp", True),
- ("/etc/os-release", "/tmp", False)
+ ("/tmp/not-safe-file", True, "/tmp/dst", False),
+ ("/tmp/safe-file", False, "/tmp/dst", True)
])
-def test_is_safe_to_hardlink(cobbler_api, test_src, test_dst, expected_result):
+def test_is_safe_to_hardlink(cobbler_api, test_src, is_symlink, test_dst, expected_result):
# Arrange
- # TODO: Generate cases
+ if is_symlink and test_src:
+ os.symlink("/foobar/test", test_src)
+ elif test_src:
+ open(test_src, 'w').close()
# Act
result = utils.is_safe_to_hardlink(test_src, test_dst, cobbler_api)
+ # Cleanup
+ os.remove(test_src)
+
# Assert
assert expected_result == result
@@ -608,13 +614,19 @@ def test_get_mtab():
def test_get_file_device_path():
# Arrange
+ test_symlink = "/tmp/test_symlink"
+ os.symlink("/foobar/test", test_symlink)
# Act
- result = utils.get_file_device_path("/etc/os-release")
+ result = utils.get_file_device_path(test_symlink)
+
+ # Cleanup
+ os.remove(test_symlink)
# Assert
- # TODO Does not work in all environments (e.g. openSUSE TW with BTRFS)
- assert result == ("overlay", "/usr/lib/os-release")
+ assert len(result) == 2
+ assert isinstance(result[0], str)
+ assert result[1] == "/foobar/test"
def test_is_remote_file():
@@ -722,7 +734,7 @@ def test_local_get_cobbler_api_url():
result = utils.local_get_cobbler_api_url()
# Assert
- assert result == "http://192.168.1.1:80/cobbler_api"
+ assert result in ["http://192.168.1.1:80/cobbler_api", "http://127.0.0.1:80/cobbler_api"]
def test_local_get_cobbler_xmlrpc_url():
Index: cobbler-3.3.3/tests/actions/buildiso/append_line_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/actions/buildiso/append_line_test.py
+++ cobbler-3.3.3/tests/actions/buildiso/append_line_test.py
@@ -26,8 +26,8 @@ def test_generate_system(
# TODO: Make tests more sophisticated
assert (
result
- == " APPEND initrd=%s.img install=http://192.168.1.1:80/cblr/links/%s autoyast=default.ks"
- % (request.node.originalname, request.node.originalname)
+ == " APPEND initrd=%s.img install=http://127.0.0.1:80/cblr/links/%s autoyast=default.ks"
+ % (request.node.name, request.node.name)
)
@@ -46,6 +46,6 @@ def test_generate_profile(request, cobbl
# TODO: Make tests more sophisticated
assert (
result
- == " append initrd=%s.img install=http://192.168.1.1:80/cblr/links/%s autoyast=default.ks"
- % (request.node.originalname, request.node.originalname)
+ == " APPEND initrd=%s.img install=http://127.0.0.1:80/cblr/links/%s autoyast=default.ks"
+ % (request.node.name, request.node.name)
)
Index: cobbler-3.3.3/tests/items/item_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/items/item_test.py
+++ cobbler-3.3.3/tests/items/item_test.py
@@ -95,7 +95,7 @@ def test_get_conceptual_parent(request,
tmp_distro = create_distro()
tmp_profile = create_profile(tmp_distro.name)
titem = Profile(cobbler_api)
- titem.name = "subprofile_%s" % request.node.originalname
+ titem.name = "subprofile_%s" % (request.node.originalname if request.node.originalname else request.node.name)
titem.parent = tmp_profile.name
# Act
@@ -297,13 +297,13 @@ def test_fetchable_files(cobbler_api):
def test_sort_key(request, cobbler_api):
# Arrange
titem = Item(cobbler_api)
- titem.name = request.node.originalname
+ titem.name = request.node.originalname if request.node.originalname else request.node.name
# Act
result = titem.sort_key(sort_fields=["name"])
# Assert
- assert result == [request.node.originalname]
+ assert result == [request.node.originalname if request.node.originalname else request.node.name]
@pytest.mark.skip("Test not yet implemented")
@@ -340,7 +340,7 @@ def test_dump_vars(cobbler_api):
# Assert
assert "default_ownership" in result
assert "owners" in result
- assert len(result) == 149
+ assert len(result) == 150
@pytest.mark.parametrize(
@@ -409,7 +409,7 @@ def test_parent(cobbler_api):
def test_check_if_valid(request, cobbler_api):
# Arrange
titem = Item(cobbler_api)
- titem.name = request.node.originalname
+ titem.name = request.node.originalname if request.node.originalname else request.node.name
# Act
titem.check_if_valid()
@@ -486,4 +486,4 @@ def test_grab_tree(cobbler_api):
# Assert
assert isinstance(result, list)
- assert result[-1].server == "192.168.1.1"
+ assert result[-1].server == "127.0.0.1"
Index: cobbler-3.3.3/tests/items/profile_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/items/profile_test.py
+++ cobbler-3.3.3/tests/items/profile_test.py
@@ -157,7 +157,7 @@ def test_dhcp_tag(cobbler_api):
"input_server,expected_exception,expected_result",
[
("", does_not_raise(), ""),
- ("<<inherit>>", does_not_raise(), "192.168.1.1"),
+ ("<<inherit>>", does_not_raise(), "127.0.0.1"),
(False, pytest.raises(TypeError), ""),
],
)
Index: cobbler-3.3.3/tests/items/system_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/items/system_test.py
+++ cobbler-3.3.3/tests/items/system_test.py
@@ -220,7 +220,7 @@ def test_netboot_enabled(cobbler_api, va
"input_next_server,expected_exception,expected_result",
[
("", does_not_raise(), ""),
- ("<<inherit>>", does_not_raise(), "192.168.1.1"),
+ ("<<inherit>>", does_not_raise(), "127.0.0.1"),
(False, pytest.raises(TypeError), ""),
],
)
@@ -404,8 +404,8 @@ def test_redhat_management_key(
@pytest.mark.parametrize(
"input_server,expected_exception,expected_result",
[
- ("", does_not_raise(), "192.168.1.1"),
- ("<<inherit>>", does_not_raise(), "192.168.1.1"),
+ ("", does_not_raise(), "127.0.0.1"),
+ ("<<inherit>>", does_not_raise(), "127.0.0.1"),
("1.1.1.1", does_not_raise(), "1.1.1.1"),
(False, pytest.raises(TypeError), None),
],
Index: cobbler-3.3.3/tests/modules/managers/dnsmasq_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/modules/managers/dnsmasq_test.py
+++ cobbler-3.3.3/tests/modules/managers/dnsmasq_test.py
@@ -61,8 +61,8 @@ def test_manager_write_configs(mocker, c
{
"insert_cobbler_system_definitions": "dhcp-host=net:x86_64,aa:bb:cc:dd:ee:ff,host.example.org,192.168.1.2,[::1]\n",
"date": "Mon Jan 1 00:00:00 2000",
- "cobbler_server": "192.168.1.1",
- "next_server_v4": "192.168.1.1",
+ "cobbler_server": "127.0.0.1",
+ "next_server_v4": "127.0.0.1",
"next_server_v6": "::1",
},
"/etc/dnsmasq.conf",
Index: cobbler-3.3.3/tests/actions/buildiso/buildiso_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/actions/buildiso/buildiso_test.py
+++ cobbler-3.3.3/tests/actions/buildiso/buildiso_test.py
@@ -12,15 +12,15 @@ from tests.conftest import does_not_rais
@pytest.mark.parametrize(
"input_arch,result_binary_name,expected_exception",
[
- (enums.Archs.X86_64, "grubx64.efi", does_not_raise()),
- (enums.Archs.PPC, "grub.ppc64le", does_not_raise()),
- (enums.Archs.PPC64, "grub.ppc64le", does_not_raise()),
- (enums.Archs.PPC64EL, "grub.ppc64le", does_not_raise()),
- (enums.Archs.PPC64LE, "grub.ppc64le", does_not_raise()),
- (enums.Archs.AARCH64, "grubaa64.efi", does_not_raise()),
- (enums.Archs.ARM, "bootarm.efi", does_not_raise()),
- (enums.Archs.I386, "bootia32.efi", does_not_raise()),
- (enums.Archs.IA64, "bootia64.efi", does_not_raise()),
+ (enums.Archs.X86_64, ["grubx64.efi", "grubx86.efi"], does_not_raise()),
+ (enums.Archs.PPC, ["grub.ppc64le"], does_not_raise()),
+ (enums.Archs.PPC64, ["grub.ppc64le"], does_not_raise()),
+ (enums.Archs.PPC64EL, ["grub.ppc64le"], does_not_raise()),
+ (enums.Archs.PPC64LE, ["grub.ppc64le"], does_not_raise()),
+ (enums.Archs.AARCH64, ["grubaa64.efi"], does_not_raise()),
+ (enums.Archs.ARM, ["bootarm.efi"], does_not_raise()),
+ (enums.Archs.I386, ["bootia32.efi"], does_not_raise()),
+ (enums.Archs.IA64, ["bootia64.efi"], does_not_raise()),
],
)
def test_calculate_grub_name(
@@ -41,7 +41,7 @@ def test_calculate_grub_name(
result = test_builder.calculate_grub_name(test_distro)
# Assert
- assert result == result_binary_name
+ assert result in result_binary_name
@pytest.mark.parametrize(
Index: cobbler-3.3.3/tests/settings/migrations/normalize_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/settings/migrations/normalize_test.py
+++ cobbler-3.3.3/tests/settings/migrations/normalize_test.py
@@ -32,7 +32,7 @@ def test_normalize_v3_0_0():
new_settings = V3_0_0.normalize(old_settings_dict)
# Assert
- assert len(V3_0_0.normalize(new_settings)) == 111
+ assert len(V3_0_0.normalize(new_settings)) == 113
def test_normalize_v3_0_1():
@@ -44,7 +44,7 @@ def test_normalize_v3_0_1():
new_settings = V3_0_1.normalize(old_settings_dict)
# Assert
- assert len(V3_0_1.normalize(new_settings)) == 111
+ assert len(V3_0_1.normalize(new_settings)) == 113
def test_normalize_v3_1_0():
@@ -56,7 +56,7 @@ def test_normalize_v3_1_0():
new_settings = V3_1_0.normalize(old_settings_dict)
# Assert
- assert len(V3_1_0.normalize(new_settings)) == 111
+ assert len(V3_1_0.normalize(new_settings)) == 113
def test_normalize_v3_1_1():
@@ -68,7 +68,7 @@ def test_normalize_v3_1_1():
new_settings = V3_1_1.normalize(old_settings_dict)
# Assert
- assert len(V3_1_1.normalize(new_settings)) == 111
+ assert len(V3_1_1.normalize(new_settings)) == 113
def test_normalize_v3_1_2():
@@ -80,7 +80,7 @@ def test_normalize_v3_1_2():
new_settings = V3_1_2.normalize(old_settings_dict)
# Assert
- assert len(V3_1_2.normalize(new_settings)) == 110
+ assert len(V3_1_2.normalize(new_settings)) == 112
def test_normalize_v3_2_0():
@@ -92,7 +92,7 @@ def test_normalize_v3_2_0():
new_settings = V3_2_0.normalize(old_settings_dict)
# Assert
- assert len(V3_2_0.normalize(new_settings)) == 112
+ assert len(V3_2_0.normalize(new_settings)) == 114
def test_normalize_v3_2_1():
@@ -104,7 +104,7 @@ def test_normalize_v3_2_1():
new_settings = V3_2_1.normalize(old_settings_dict)
# Assert
- assert len(V3_2_1.normalize(new_settings)) == 111
+ assert len(V3_2_1.normalize(new_settings)) == 113
def test_normalize_v3_3_0():
@@ -116,7 +116,7 @@ def test_normalize_v3_3_0():
new_settings = V3_3_0.normalize(old_settings_dict)
# Assert
- assert len(V3_3_0.normalize(new_settings)) == 121
+ assert len(V3_3_0.normalize(new_settings)) == 123
def test_normalize_v3_3_1():
@@ -128,7 +128,7 @@ def test_normalize_v3_3_1():
new_settings = V3_3_1.normalize(old_settings_dict)
# Assert
- assert len(V3_3_1.normalize(new_settings)) == 129
+ assert len(V3_3_1.normalize(new_settings)) == 131
def test_normalize_v3_3_2():
@@ -140,7 +140,7 @@ def test_normalize_v3_3_2():
new_settings = V3_3_2.normalize(old_settings_dict)
# Assert
- assert len(V3_3_2.normalize(new_settings)) == 129
+ assert len(V3_3_2.normalize(new_settings)) == 131
def test_normalize_v3_3_3():
@@ -152,6 +152,6 @@ def test_normalize_v3_3_3():
new_settings = V3_3_3.normalize(old_settings_dict)
# Assert
- assert len(new_settings) == 130
+ assert len(new_settings) == 131
# Migration of default_virt_file_size to float is working
assert isinstance(new_settings.get("default_virt_file_size", None), float)
Index: cobbler-3.3.3/tests/xmlrpcapi/non_object_calls_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/xmlrpcapi/non_object_calls_test.py
+++ cobbler-3.3.3/tests/xmlrpcapi/non_object_calls_test.py
@@ -276,5 +276,8 @@ def test_get_item_resolved_value(
with expected_exception:
result = remote.get_item_resolved_value(test_item.get("uid"), input_attribute)
+ if input_attribute == "interfaces" and "default" in result:
+ result.pop("default")
+
# Assert
assert expected_result == result
Index: cobbler-3.3.3/tests/actions/mkloaders_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/actions/mkloaders_test.py
+++ cobbler-3.3.3/tests/actions/mkloaders_test.py
@@ -27,12 +27,10 @@ def test_grubimage_run(cobbler_api, mock
# Assert
# On a full install: 3 common formats, 4 syslinux links and 9 bootloader formats
- # In our test container we have: shim (1x), ipxe (1x), syslinux v4 (3x) and 3 grubs (4x)
- # On GH we have: shim (1x), ipxe (1x), syslinux v4 (3x) and 3 grubs (3x)
- assert mkloaders.symlink.call_count == 8
- # In our test container we have: x86_64, arm64-efi, i386-efi & i386-pc-pxe
- # On GH we have: x86_64, i386-efi & i386-pc-pxe
- assert mkloaders.mkimage.call_count == 3
+ # In our Uyuni/SUMA test container we have: shim (1x), ipxe (1x), syslinux v4 (3x) and 1 grub (1x)
+ assert mkloaders.symlink.call_count == 6
+ # In our Uyuni/SUMA test container we have: x86_64
+ assert mkloaders.mkimage.call_count == 2
def test_mkimage(mocker):
Index: cobbler-3.3.3/tests/actions/reposync_test.py
===================================================================
--- cobbler-3.3.3.orig/tests/actions/reposync_test.py
+++ cobbler-3.3.3/tests/actions/reposync_test.py
@@ -46,6 +46,7 @@ def remove_repo(api):
api.remove_repo(test_repo.name)
+@pytest.mark.skip("Slow test as it downloads few GB of data packages")
class TestRepoSync:
@pytest.mark.usefixtures("remove_repo")
@pytest.mark.parametrize(
