From eb01407bc53e58a68dc19d95c226f3cd09c9f80d Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 26 Mar 2024 22:09:59 +0100 Subject: [PATCH] rm cmd/osbuild-dnf-json-tests Test cmd for dnf-json that's run in (and requires) osbuild-composer. This is not useful in this repository. --- cmd/osbuild-dnf-json-tests/main_test.go | 121 ------------------------ 1 file changed, 121 deletions(-) delete mode 100644 cmd/osbuild-dnf-json-tests/main_test.go diff --git a/cmd/osbuild-dnf-json-tests/main_test.go b/cmd/osbuild-dnf-json-tests/main_test.go deleted file mode 100644 index 2a698890de..0000000000 --- a/cmd/osbuild-dnf-json-tests/main_test.go +++ /dev/null @@ -1,121 +0,0 @@ -// This package contains tests related to dnf-json and rpmmd package. - -//go:build integration - -package main - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/osbuild/images/pkg/arch" - "github.com/osbuild/images/pkg/blueprint" - "github.com/osbuild/images/pkg/distro" - "github.com/osbuild/images/pkg/distro/rhel9" - "github.com/osbuild/images/pkg/dnfjson" - "github.com/osbuild/images/pkg/ostree" - "github.com/osbuild/images/pkg/reporegistry" - "github.com/osbuild/images/pkg/rpmmd" -) - -// This test loads all the repositories available in /repositories directory -// and tries to run depsolve for each architecture. With N architectures available -// this should run cross-arch dependency solving N-1 times. -func TestCrossArchDepsolve(t *testing.T) { - // Load repositories from the definition we provide in the RPM package - repoDir := "/usr/share/tests/osbuild-composer" - - // NOTE: we can add RHEL, but don't make it hard requirement because it will fail outside of VPN - c9s := rhel9.DistroFactory("centos-9") - - // Set up temporary directory for rpm/dnf cache - dir := t.TempDir() - baseSolver := dnfjson.NewBaseSolver(dir) - - repos, err := reporegistry.LoadRepositories([]string{repoDir}, c9s.Name()) - require.NoErrorf(t, err, "Failed to LoadRepositories %v", c9s.Name()) - - for _, archStr := range c9s.ListArches() { - t.Run(archStr, func(t *testing.T) { - arch, err := c9s.GetArch(archStr) - require.NoError(t, err) - solver := baseSolver.NewWithConfig(c9s.ModulePlatformID(), c9s.Releasever(), archStr, c9s.Name()) - for _, imgTypeStr := range arch.ListImageTypes() { - t.Run(imgTypeStr, func(t *testing.T) { - imgType, err := arch.GetImageType(imgTypeStr) - require.NoError(t, err) - // set up bare minimum args for image type - var customizations *blueprint.Customizations - if imgTypeStr == "edge-simplified-installer" { - customizations = &blueprint.Customizations{ - InstallationDevice: "/dev/null", - } - } - manifest, _, err := imgType.Manifest( - &blueprint.Blueprint{ - Customizations: customizations, - }, - distro.ImageOptions{ - OSTree: &ostree.ImageOptions{ - URL: "https://example.com", // required by some image types - }, - }, - repos[archStr], 0) - assert.NoError(t, err) - - for _, set := range manifest.GetPackageSetChains() { - _, err = solver.Depsolve(set) - assert.NoError(t, err) - } - }) - } - }) - } -} - -// This test loads all the repositories available in /repositories directory -// and tries to depsolve all package sets of one image type for one architecture. -func TestDepsolvePackageSets(t *testing.T) { - // Load repositories from the definition we provide in the RPM package - repoDir := "/usr/share/tests/osbuild-composer" - - // NOTE: we can add RHEL, but don't make it hard requirement because it will fail outside of VPN - c9s := rhel9.DistroFactory("centos-9") - - // Set up temporary directory for rpm/dnf cache - dir := t.TempDir() - solver := dnfjson.NewSolver(c9s.ModulePlatformID(), c9s.Releasever(), arch.ARCH_X86_64.String(), c9s.Name(), dir) - - repos, err := reporegistry.LoadRepositories([]string{repoDir}, c9s.Name()) - require.NoErrorf(t, err, "Failed to LoadRepositories %v", c9s.Name()) - x86Repos, ok := repos[arch.ARCH_X86_64.String()] - require.Truef(t, ok, "failed to get %q repos for %q", arch.ARCH_X86_64.String(), c9s.Name()) - - x86Arch, err := c9s.GetArch(arch.ARCH_X86_64.String()) - require.Nilf(t, err, "failed to get %q arch of %q distro", arch.ARCH_X86_64.String(), c9s.Name()) - - qcow2ImageTypeName := "qcow2" - qcow2Image, err := x86Arch.GetImageType(qcow2ImageTypeName) - require.Nilf(t, err, "failed to get %q image type of %q/%q distro/arch", qcow2ImageTypeName, c9s.Name(), arch.ARCH_X86_64.String()) - - manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, 0) - require.Nilf(t, err, "failed to initialise manifest for %q image type of %q/%q distro/arch", qcow2ImageTypeName, c9s.Name(), arch.ARCH_X86_64.String()) - imagePkgSets := manifestSource.GetPackageSetChains() - - gotPackageSpecsSets := make(map[string][]rpmmd.PackageSpec, len(imagePkgSets)) - for name, pkgSet := range imagePkgSets { - res, err := solver.Depsolve(pkgSet) - if err != nil { - require.Nil(t, err) - } - gotPackageSpecsSets[name] = res - } - expectedPackageSpecsSetNames := []string{"build", "os"} - require.EqualValues(t, len(expectedPackageSpecsSetNames), len(gotPackageSpecsSets)) - for _, name := range expectedPackageSpecsSetNames { - _, ok := gotPackageSpecsSets[name] - assert.True(t, ok) - } -}