dnfjson: skip TestDepsolver() if no osbuild-depsolve-dnf is installed

Do not fail if `osbuild-depsolve-dnf` is missing.
osbuild · Jan 12, 2024 · c5d9511 · c5d9511
1 parent 8e74dc6
commit c5d9511
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/dnfjson/dnfjson.go b/pkg/dnfjson/dnfjson.go
@@ -57,7 +57,7 @@ func findDepsolveDnf() string {
 
 	// if it's not found, return empty string; the run() function will fail if
 	// it's used before setting.
-	return locations[0]
+	return ""
 }
 
 // Create a new unconfigured BaseSolver (without platform information). It can

diff --git a/pkg/dnfjson/dnfjson_test.go b/pkg/dnfjson/dnfjson_test.go
@@ -33,6 +33,10 @@ func TestDepsolver(t *testing.T) {
 		if !dnfInstalled() {
 			t.Skip()
 		}
+
+		if findDepsolveDnf() == "" {
+			t.Skip("Test needs an installed osbuild-depsolve-dnf")
+		}
 	}
 
 	s := rpmrepo.NewTestServer()
@@ -558,6 +562,10 @@ func TestErrorRepoInfo(t *testing.T) {
 		if !dnfInstalled() {
 			t.Skip()
 		}
+
+		if findDepsolveDnf() == "" {
+			t.Skip("Test needs an installed osbuild-depsolve-dnf")
+		}
 	}
 
 	assert := assert.New(t)