client: improve test temporary dirs
This commit is contained in:
parent
9db1f304fa
commit
39a65e3f34
1 changed files with 6 additions and 2 deletions
|
|
@ -6,7 +6,6 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
@ -45,7 +44,7 @@ func setupDNFJSON() string {
|
||||||
|
|
||||||
func executeTests(m *testing.M) int {
|
func executeTests(m *testing.M) int {
|
||||||
// Setup the mocked server running on a temporary domain socket
|
// Setup the mocked server running on a temporary domain socket
|
||||||
tmpdir, err := ioutil.TempDir("", "client_test-")
|
tmpdir, err := os.MkdirTemp("", "client_test-")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
@ -79,6 +78,11 @@ func executeTests(m *testing.M) int {
|
||||||
})
|
})
|
||||||
|
|
||||||
dspath, err := os.MkdirTemp(tmpdir, "")
|
dspath, err := os.MkdirTemp(tmpdir, "")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("ERROR: Could not create temporary directory for dnfjson: %s\n", err)
|
||||||
|
}
|
||||||
|
defer os.RemoveAll(dspath)
|
||||||
|
|
||||||
dnfjsonFixture := dnfjson_mock.Base(dspath)
|
dnfjsonFixture := dnfjson_mock.Base(dspath)
|
||||||
solver := dnfjson.NewBaseSolver(path.Join(tmpdir, "dnfjson-cache"))
|
solver := dnfjson.NewBaseSolver(path.Join(tmpdir, "dnfjson-cache"))
|
||||||
solver.SetDNFJSONPath(dnfjsonPath, dnfjsonFixture)
|
solver.SetDNFJSONPath(dnfjsonPath, dnfjsonFixture)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue