tets_helpers: handle t=nil in InitFS
The reverse tests call InitFS with t=nil. By calling panic we get a better error message instead of a generic nil pointer dereference.
This commit is contained in:
parent
e042eb38fa
commit
6bd2da89d3
|
@ -7,6 +7,7 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
@ -110,7 +111,11 @@ func ResetTmpDir(createDirIV bool) {
|
||||||
func InitFS(t *testing.T, extraArgs ...string) string {
|
func InitFS(t *testing.T, extraArgs ...string) string {
|
||||||
dir, err := ioutil.TempDir(TmpDir, "")
|
dir, err := ioutil.TempDir(TmpDir, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
if t != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
} else {
|
||||||
|
log.Panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
args := []string{"-q", "-init", "-extpass", "echo test", "-scryptn=10"}
|
args := []string{"-q", "-init", "-extpass", "echo test", "-scryptn=10"}
|
||||||
args = append(args, extraArgs...)
|
args = append(args, extraArgs...)
|
||||||
|
@ -122,7 +127,11 @@ func InitFS(t *testing.T, extraArgs ...string) string {
|
||||||
|
|
||||||
err = cmd.Run()
|
err = cmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("InitFS with args %v failed: %v", args, err)
|
if t != nil {
|
||||||
|
t.Fatalf("InitFS with args %v failed: %v", args, err)
|
||||||
|
} else {
|
||||||
|
log.Panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return dir
|
return dir
|
||||||
|
|
Loading…
Reference in New Issue