summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-06-25 22:02:05 +0200
committerJakob Unterwurzacher2018-07-01 20:56:22 +0200
commit91de77943fba3cb993aad4e9756e159c4514764a (patch)
tree7cc07a23ec031e93b0c896b4541a94beaed46aee /tests
parent8e5ca7299a3292cae64418aaf875819c2cca01f5 (diff)
configfile: reduce function name stutter
configfile.LoadConfFile() -> configfile.Load() configfile.CreateConfFile() -> configfile.Create()
Diffstat (limited to 'tests')
-rw-r--r--tests/cli/cli_test.go6
-rw-r--r--tests/plaintextnames/plaintextnames_test.go2
-rw-r--r--tests/trezor/trezor_test.go2
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index 5508360..5b78359 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
// Test -init flag
func TestInit(t *testing.T) {
dir := test_helpers.InitFS(t)
- _, c, err := configfile.LoadConfFile(dir+"/"+configfile.ConfDefaultName, testPw)
+ _, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, testPw)
if err != nil {
t.Fatal(err)
}
@@ -51,7 +51,7 @@ func TestInitDevRandom(t *testing.T) {
// Test -init with -aessiv
func TestInitAessiv(t *testing.T) {
dir := test_helpers.InitFS(t, "-aessiv")
- _, c, err := configfile.LoadConfFile(dir+"/"+configfile.ConfDefaultName, testPw)
+ _, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, testPw)
if err != nil {
t.Fatal(err)
}
@@ -63,7 +63,7 @@ func TestInitAessiv(t *testing.T) {
// Test -init with -reverse
func TestInitReverse(t *testing.T) {
dir := test_helpers.InitFS(t, "-reverse")
- _, c, err := configfile.LoadConfFile(dir+"/"+configfile.ConfReverseName, testPw)
+ _, c, err := configfile.Load(dir+"/"+configfile.ConfReverseName, testPw)
if err != nil {
t.Fatal(err)
}
diff --git a/tests/plaintextnames/plaintextnames_test.go b/tests/plaintextnames/plaintextnames_test.go
index 6b513aa..121a4a0 100644
--- a/tests/plaintextnames/plaintextnames_test.go
+++ b/tests/plaintextnames/plaintextnames_test.go
@@ -29,7 +29,7 @@ func TestMain(m *testing.M) {
// Only the PlaintextNames feature flag should be set
func TestFlags(t *testing.T) {
- _, cf, err := configfile.LoadConfFile(cDir+"/gocryptfs.conf", testPw)
+ _, cf, err := configfile.Load(cDir+"/gocryptfs.conf", testPw)
if err != nil {
t.Fatal(err)
}
diff --git a/tests/trezor/trezor_test.go b/tests/trezor/trezor_test.go
index 65f1f15..5db56e2 100644
--- a/tests/trezor/trezor_test.go
+++ b/tests/trezor/trezor_test.go
@@ -35,7 +35,7 @@ func TestInitTrezor(t *testing.T) {
// vvvvvvvvvvvvv disable -extpass
dir := test_helpers.InitFS(t, "-trezor", "-extpass", "")
// The freshly created config file should have the Trezor feature flag set.
- _, c, err := configfile.LoadConfFile(dir+"/"+configfile.ConfDefaultName, nil)
+ _, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, nil)
if err != nil {
t.Fatal(err)
}