summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--awwan_test.go6
-rw-r--r--testdata/local/.awwan.env.plain (renamed from testdata/encrypt/.awwan.env.plain)0
-rw-r--r--testdata/local/.awwan.env.vault (renamed from testdata/encrypt/.awwan.env.vault)bin384 -> 384 bytes
l---------testdata/local/.awwan.key (renamed from testdata/encrypt/.awwan.key)0
-rw-r--r--testdata/local/.ssh/empty (renamed from testdata/encrypt/.ssh/empty)0
-rw-r--r--testdata/local/awwan.env (renamed from testdata/encrypt/awwan.env)0
-rw-r--r--testdata/local/encrypted.txt.org (renamed from testdata/encrypt/encrypted.txt.org)0
-rw-r--r--testdata/local/encrypted.txt.vault (renamed from testdata/encrypt/encrypted.txt.vault)0
-rw-r--r--testdata/local/local.aww (renamed from testdata/encrypt/local.aww)0
-rw-r--r--testdata/local/plain.txt (renamed from testdata/encrypt/plain.txt)0
-rw-r--r--testdata/local/sub/.awwan.env.plain (renamed from testdata/encrypt/sub/.awwan.env.plain)0
-rw-r--r--testdata/local/sub/.awwan.env.vault (renamed from testdata/encrypt/sub/.awwan.env.vault)bin384 -> 384 bytes
-rw-r--r--testdata/local/sub/local.aww (renamed from testdata/encrypt/sub/local.aww)0
-rw-r--r--testdata/local/test.data (renamed from testdata/encrypt/test.data)0
-rw-r--r--testdata/local/tmp/.gitignore (renamed from testdata/encrypt/tmp/.gitignore)0
16 files changed, 4 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 85920b1..6cef159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,4 @@
/testdata/decrypt-with-passphrase/.awwan.env
/testdata/encrypt-with-passphrase/.awwan.env.vault
/testdata/encrypt-without-passphrase/.awwan.env.vault
-/testdata/encrypt/.cache
-/testdata/encrypt/file.txt.decrypted
+/testdata/local/.cache
diff --git a/awwan_test.go b/awwan_test.go
index 77e64ec..349072b 100644
--- a/awwan_test.go
+++ b/awwan_test.go
@@ -163,13 +163,13 @@ func TestAwwanLocal_withEncryption(t *testing.T) {
err error
)
- tdata, err = test.LoadData(`testdata/encrypt/test.data`)
+ tdata, err = test.LoadData(`testdata/local/test.data`)
if err != nil {
t.Fatal(err)
}
var (
- basedir = filepath.Join(`testdata`, `encrypt`)
+ basedir = filepath.Join(`testdata`, `local`)
mockout = bytes.Buffer{}
mockerr = bytes.Buffer{}
mockrw = mock.ReadWriter{}
@@ -227,7 +227,7 @@ func TestAwwanLocalPut(t *testing.T) {
// Load the test data output.
var (
- baseDir = filepath.Join(`testdata`, `encrypt`)
+ baseDir = filepath.Join(`testdata`, `local`)
tdata *test.Data
err error
diff --git a/testdata/encrypt/.awwan.env.plain b/testdata/local/.awwan.env.plain
index 26ed285..26ed285 100644
--- a/testdata/encrypt/.awwan.env.plain
+++ b/testdata/local/.awwan.env.plain
diff --git a/testdata/encrypt/.awwan.env.vault b/testdata/local/.awwan.env.vault
index a4e4bdd..a4e4bdd 100644
--- a/testdata/encrypt/.awwan.env.vault
+++ b/testdata/local/.awwan.env.vault
Binary files differ
diff --git a/testdata/encrypt/.awwan.key b/testdata/local/.awwan.key
index aa99eff..aa99eff 120000
--- a/testdata/encrypt/.awwan.key
+++ b/testdata/local/.awwan.key
diff --git a/testdata/encrypt/.ssh/empty b/testdata/local/.ssh/empty
index e69de29..e69de29 100644
--- a/testdata/encrypt/.ssh/empty
+++ b/testdata/local/.ssh/empty
diff --git a/testdata/encrypt/awwan.env b/testdata/local/awwan.env
index 81b55e7..81b55e7 100644
--- a/testdata/encrypt/awwan.env
+++ b/testdata/local/awwan.env
diff --git a/testdata/encrypt/encrypted.txt.org b/testdata/local/encrypted.txt.org
index de6797e..de6797e 100644
--- a/testdata/encrypt/encrypted.txt.org
+++ b/testdata/local/encrypted.txt.org
diff --git a/testdata/encrypt/encrypted.txt.vault b/testdata/local/encrypted.txt.vault
index 43cb223..43cb223 100644
--- a/testdata/encrypt/encrypted.txt.vault
+++ b/testdata/local/encrypted.txt.vault
diff --git a/testdata/encrypt/local.aww b/testdata/local/local.aww
index a77ec42..a77ec42 100644
--- a/testdata/encrypt/local.aww
+++ b/testdata/local/local.aww
diff --git a/testdata/encrypt/plain.txt b/testdata/local/plain.txt
index de6797e..de6797e 100644
--- a/testdata/encrypt/plain.txt
+++ b/testdata/local/plain.txt
diff --git a/testdata/encrypt/sub/.awwan.env.plain b/testdata/local/sub/.awwan.env.plain
index 02b2ae0..02b2ae0 100644
--- a/testdata/encrypt/sub/.awwan.env.plain
+++ b/testdata/local/sub/.awwan.env.plain
diff --git a/testdata/encrypt/sub/.awwan.env.vault b/testdata/local/sub/.awwan.env.vault
index 21aa5b1..21aa5b1 100644
--- a/testdata/encrypt/sub/.awwan.env.vault
+++ b/testdata/local/sub/.awwan.env.vault
Binary files differ
diff --git a/testdata/encrypt/sub/local.aww b/testdata/local/sub/local.aww
index d9127db..d9127db 100644
--- a/testdata/encrypt/sub/local.aww
+++ b/testdata/local/sub/local.aww
diff --git a/testdata/encrypt/test.data b/testdata/local/test.data
index 330e646..330e646 100644
--- a/testdata/encrypt/test.data
+++ b/testdata/local/test.data
diff --git a/testdata/encrypt/tmp/.gitignore b/testdata/local/tmp/.gitignore
index 120f485..120f485 100644
--- a/testdata/encrypt/tmp/.gitignore
+++ b/testdata/local/tmp/.gitignore