sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-08 00:04:37 -04:00
Code Issues Projects Releases Wiki Activity

test: use T.TempDir to create temporary test directory (#1709)

Browse Source 
The directory created by `T.TempDir` is automatically removed when the
test and all its subtests complete.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2022-02-11 16:30:54 +08:00 committed by GitHub
parent f719a6ffca
commit 83a257b16b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/download/abs_test.go
View File

@ -229,8 +229,7 @@ func TestABSPKGBUILDRepo(t *testing.T) {
// THEN a pull command should be formed // THEN a pull command should be formed
func TestABSPKGBUILDRepoExistsPerms(t *testing.T) { func TestABSPKGBUILDRepoExistsPerms(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
os.MkdirAll(filepath.Join(dir, "linux", ".git"), 0o777) os.MkdirAll(filepath.Join(dir, "linux", ".git"), 0o777)

6
pkg/download/aur_test.go
View File

@ -108,8 +108,7 @@ func TestAURPKGBUILDRepo(t *testing.T) {
// THEN a pull command should be formed // THEN a pull command should be formed
func TestAURPKGBUILDRepoExistsPerms(t *testing.T) { func TestAURPKGBUILDRepoExistsPerms(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
os.MkdirAll(filepath.Join(dir, "yay-bin", ".git"), 0o777) os.MkdirAll(filepath.Join(dir, "yay-bin", ".git"), 0o777)
@ -140,8 +139,7 @@ func TestAURPKGBUILDRepoExistsPerms(t *testing.T) {
func TestAURPKGBUILDRepos(t *testing.T) { func TestAURPKGBUILDRepos(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
os.MkdirAll(filepath.Join(dir, "yay-bin", ".git"), 0o777) os.MkdirAll(filepath.Join(dir, "yay-bin", ".git"), 0o777)

15
pkg/download/unified_test.go
View File

@ -20,8 +20,7 @@ import (
// THEN all should be found and cloned, except the repo one // THEN all should be found and cloned, except the repo one
func TestPKGBUILDReposDefinedDBPull(t *testing.T) { func TestPKGBUILDReposDefinedDBPull(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
os.MkdirAll(filepath.Join(dir, "yay", ".git"), 0o777) os.MkdirAll(filepath.Join(dir, "yay", ".git"), 0o777)
@ -52,8 +51,7 @@ func TestPKGBUILDReposDefinedDBPull(t *testing.T) {
// THEN all should be found and cloned // THEN all should be found and cloned
func TestPKGBUILDReposDefinedDBClone(t *testing.T) { func TestPKGBUILDReposDefinedDBClone(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
targets := []string{"core/yay", "yay-bin", "yay-git"} targets := []string{"core/yay", "yay-bin", "yay-git"}
cmdRunner := &testRunner{} cmdRunner := &testRunner{}
@ -82,8 +80,7 @@ func TestPKGBUILDReposDefinedDBClone(t *testing.T) {
// THEN all should be found and cloned // THEN all should be found and cloned
func TestPKGBUILDReposClone(t *testing.T) { func TestPKGBUILDReposClone(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
targets := []string{"yay", "yay-bin", "yay-git"} targets := []string{"yay", "yay-bin", "yay-git"}
cmdRunner := &testRunner{} cmdRunner := &testRunner{}
@ -112,8 +109,7 @@ func TestPKGBUILDReposClone(t *testing.T) {
// THEN all aur be found and cloned // THEN all aur be found and cloned
func TestPKGBUILDReposNotFound(t *testing.T) { func TestPKGBUILDReposNotFound(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
targets := []string{"extra/yay", "yay-bin", "yay-git"} targets := []string{"extra/yay", "yay-bin", "yay-git"}
cmdRunner := &testRunner{} cmdRunner := &testRunner{}
@ -142,8 +138,7 @@ func TestPKGBUILDReposNotFound(t *testing.T) {
// THEN only repo should be cloned // THEN only repo should be cloned
func TestPKGBUILDReposRepoMode(t *testing.T) { func TestPKGBUILDReposRepoMode(t *testing.T) {
t.Parallel() t.Parallel()
dir, _ := os.MkdirTemp("/tmp/", "yay-test") dir := t.TempDir()
defer os.RemoveAll(dir)
targets := []string{"yay", "yay-bin", "yay-git"} targets := []string{"yay", "yay-bin", "yay-git"}
cmdRunner := &testRunner{} cmdRunner := &testRunner{}

12
pkg/pgp/keys_test.go
View File

@ -71,11 +71,7 @@ func startPgpKeyServer() *http.Server {
} }
func TestImportKeys(t *testing.T) { func TestImportKeys(t *testing.T) {
keyringDir, err := os.MkdirTemp("/tmp", "yay-test-keyring") keyringDir := t.TempDir()
if err != nil {
t.Fatalf("Unable to init test keyring %q: %v\n", keyringDir, err)
}
defer os.RemoveAll(keyringDir)
server := startPgpKeyServer() server := startPgpKeyServer()
defer func() { defer func() {
@ -150,11 +146,7 @@ func makeSrcinfo(pkgbase string, pgpkeys ...string) *gosrc.Srcinfo {
} }
func TestCheckPgpKeys(t *testing.T) { func TestCheckPgpKeys(t *testing.T) {
keyringDir, err := os.MkdirTemp("/tmp", "yay-test-keyring") keyringDir := t.TempDir()
if err != nil {
t.Fatalf("Unable to init test keyring: %v\n", err)
}
defer os.RemoveAll(keyringDir)
server := startPgpKeyServer() server := startPgpKeyServer()
defer func() { defer func() {

58
pkg/settings/config_test.go
View File

@ -14,15 +14,13 @@ import (
// WHEN the config is loaded // WHEN the config is loaded
// THEN the directory should be created // THEN the directory should be created
func TestNewConfig(t *testing.T) { func TestNewConfig(t *testing.T) {
configDir, err := os.MkdirTemp(os.TempDir(), "yay-config-home") configDir := t.TempDir()
assert.NoError(t, err) err := os.MkdirAll(filepath.Join(configDir, "yay"), 0o755)
err = os.MkdirAll(filepath.Join(configDir, "yay"), 0o755)
assert.NoError(t, err) assert.NoError(t, err)
os.Setenv("XDG_CONFIG_HOME", configDir) os.Setenv("XDG_CONFIG_HOME", configDir)
cacheDir, err := os.MkdirTemp(os.TempDir(), "yay-cache-home") cacheDir := t.TempDir()
assert.NoError(t, err)
config := map[string]string{"BuildDir": filepath.Join(cacheDir, "test-build-dir")} config := map[string]string{"BuildDir": filepath.Join(cacheDir, "test-build-dir")}
@ -48,15 +46,13 @@ func TestNewConfig(t *testing.T) {
// WHEN the config is loaded // WHEN the config is loaded
// THEN the directory of AURDEST should be created and selected // THEN the directory of AURDEST should be created and selected
func TestNewConfigAURDEST(t *testing.T) { func TestNewConfigAURDEST(t *testing.T) {
configDir, err := os.MkdirTemp(os.TempDir(), "yay-config-home") configDir := t.TempDir()
assert.NoError(t, err) err := os.MkdirAll(filepath.Join(configDir, "yay"), 0o755)
err = os.MkdirAll(filepath.Join(configDir, "yay"), 0o755)
assert.NoError(t, err) assert.NoError(t, err)
os.Setenv("XDG_CONFIG_HOME", configDir) os.Setenv("XDG_CONFIG_HOME", configDir)
cacheDir, err := os.MkdirTemp(os.TempDir(), "yay-cache-home") cacheDir := t.TempDir()
assert.NoError(t, err)
config := map[string]string{"BuildDir": filepath.Join(cacheDir, "test-other-dir")} config := map[string]string{"BuildDir": filepath.Join(cacheDir, "test-other-dir")}
os.Setenv("AURDEST", filepath.Join(cacheDir, "test-build-dir")) os.Setenv("AURDEST", filepath.Join(cacheDir, "test-build-dir"))
@ -85,16 +81,13 @@ func TestNewConfigAURDEST(t *testing.T) {
func TestConfiguration_setPrivilegeElevator(t *testing.T) { func TestConfiguration_setPrivilegeElevator(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
assert.NoError(t, err)
doas := filepath.Join(path, "sudo") doas := filepath.Join(path, "sudo")
_, err = os.Create(doas) _, err := os.Create(doas)
os.Chmod(doas, 0o755) os.Chmod(doas, 0o755)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoLoop = true config.SudoLoop = true
config.SudoFlags = "-v" config.SudoFlags = "-v"
@ -116,16 +109,13 @@ func TestConfiguration_setPrivilegeElevator(t *testing.T) {
func TestConfiguration_setPrivilegeElevator_su(t *testing.T) { func TestConfiguration_setPrivilegeElevator_su(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
assert.NoError(t, err)
doas := filepath.Join(path, "su") doas := filepath.Join(path, "su")
_, err = os.Create(doas) _, err := os.Create(doas)
os.Chmod(doas, 0o755) os.Chmod(doas, 0o755)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoLoop = true config.SudoLoop = true
config.SudoFlags = "-v" config.SudoFlags = "-v"
@ -168,16 +158,13 @@ func TestConfiguration_setPrivilegeElevator_no_path(t *testing.T) {
func TestConfiguration_setPrivilegeElevator_doas(t *testing.T) { func TestConfiguration_setPrivilegeElevator_doas(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
assert.NoError(t, err)
doas := filepath.Join(path, "doas") doas := filepath.Join(path, "doas")
_, err = os.Create(doas) _, err := os.Create(doas)
os.Chmod(doas, 0o755) os.Chmod(doas, 0o755)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoLoop = true config.SudoLoop = true
config.SudoFlags = "-v" config.SudoFlags = "-v"
@ -198,16 +185,13 @@ func TestConfiguration_setPrivilegeElevator_doas(t *testing.T) {
func TestConfiguration_setPrivilegeElevator_custom_script(t *testing.T) { func TestConfiguration_setPrivilegeElevator_custom_script(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
assert.NoError(t, err)
wrapper := filepath.Join(path, "custom-wrapper") wrapper := filepath.Join(path, "custom-wrapper")
_, err = os.Create(wrapper) _, err := os.Create(wrapper)
os.Chmod(wrapper, 0o755) os.Chmod(wrapper, 0o755)
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoLoop = true config.SudoLoop = true
config.SudoBin = wrapper config.SudoBin = wrapper
@ -230,11 +214,10 @@ func TestConfiguration_setPrivilegeElevator_custom_script(t *testing.T) {
func TestConfiguration_setPrivilegeElevator_pacman_auth_doas(t *testing.T) { func TestConfiguration_setPrivilegeElevator_pacman_auth_doas(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
require.NoError(t, err)
doas := filepath.Join(path, "doas") doas := filepath.Join(path, "doas")
_, err = os.Create(doas) _, err := os.Create(doas)
os.Chmod(doas, 0o755) os.Chmod(doas, 0o755)
require.NoError(t, err) require.NoError(t, err)
@ -243,8 +226,6 @@ func TestConfiguration_setPrivilegeElevator_pacman_auth_doas(t *testing.T) {
os.Chmod(sudo, 0o755) os.Chmod(sudo, 0o755)
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoBin = "sudo" config.SudoBin = "sudo"
config.SudoLoop = true config.SudoLoop = true
@ -267,11 +248,10 @@ func TestConfiguration_setPrivilegeElevator_pacman_auth_doas(t *testing.T) {
func TestConfiguration_setPrivilegeElevator_pacman_auth_sudo(t *testing.T) { func TestConfiguration_setPrivilegeElevator_pacman_auth_sudo(t *testing.T) {
oldPath := os.Getenv("PATH") oldPath := os.Getenv("PATH")
path, err := os.MkdirTemp("", "yay-test") path := t.TempDir()
require.NoError(t, err)
doas := filepath.Join(path, "doas") doas := filepath.Join(path, "doas")
_, err = os.Create(doas) _, err := os.Create(doas)
os.Chmod(doas, 0o755) os.Chmod(doas, 0o755)
require.NoError(t, err) require.NoError(t, err)
@ -280,8 +260,6 @@ func TestConfiguration_setPrivilegeElevator_pacman_auth_sudo(t *testing.T) {
os.Chmod(sudo, 0o755) os.Chmod(sudo, 0o755)
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(path)
config := DefaultConfig() config := DefaultConfig()
config.SudoBin = "doas" config.SudoBin = "doas"
config.SudoLoop = true config.SudoLoop = true

3
pkg/settings/dirs_test.go
View File

@ -12,8 +12,7 @@ import (
// WHEN cache home is selected // WHEN cache home is selected
// THEN the selected cache home should be in the tmp dir // THEN the selected cache home should be in the tmp dir
func Test_getCacheHome(t *testing.T) { func Test_getCacheHome(t *testing.T) {
dir, err := os.MkdirTemp(os.TempDir(), "yay-cache-home") dir := t.TempDir()
assert.NoError(t, err)
os.Unsetenv("XDG_CACHE_HOME") os.Unsetenv("XDG_CACHE_HOME")
os.Unsetenv("HOME") os.Unsetenv("HOME")
os.Setenv("SUDO_USER", "test") os.Setenv("SUDO_USER", "test")