summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2023-03-18 22:19:07 -0400
committerDave Henderson <dhenderson@gmail.com>2023-03-19 21:18:00 -0400
commit6b55748241bd55a7ffcf1c77ba474687228094f6 (patch)
tree0cdca6e2a894721df334dd830a8e96426bf36f7f /data
parentea85e7d1f5be43635024f8a291838c09429a396f (diff)
Add make test-remote-windows target to run tests on remote Windows host
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'data')
-rw-r--r--data/data_test.go11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/data_test.go b/data/data_test.go
index 6fd47b8b..2dae989c 100644
--- a/data/data_test.go
+++ b/data/data_test.go
@@ -517,8 +517,7 @@ func TestDecryptEJSON(t *testing.T) {
"_unencrypted": "notsosecret"
}`
- os.Setenv("EJSON_KEY", privateKey)
- defer os.Unsetenv("EJSON_KEY")
+ t.Setenv("EJSON_KEY", privateKey)
actual, err := decryptEJSON(in)
assert.NoError(t, err)
assert.EqualValues(t, expected, actual)
@@ -530,19 +529,17 @@ func TestDecryptEJSON(t *testing.T) {
tmpDir := fs.NewDir(t, "gomplate-ejsontest",
fs.WithFile(publicKey, privateKey),
)
- defer tmpDir.Remove()
+ t.Cleanup(tmpDir.Remove)
os.Unsetenv("EJSON_KEY")
- os.Setenv("EJSON_KEY_FILE", tmpDir.Join(publicKey))
- defer os.Unsetenv("EJSON_KEY_FILE")
+ t.Setenv("EJSON_KEY_FILE", tmpDir.Join(publicKey))
actual, err = decryptEJSON(in)
assert.NoError(t, err)
assert.EqualValues(t, expected, actual)
os.Unsetenv("EJSON_KEY")
os.Unsetenv("EJSON_KEY_FILE")
- os.Setenv("EJSON_KEYDIR", tmpDir.Path())
- defer os.Unsetenv("EJSON_KEYDIR")
+ t.Setenv("EJSON_KEYDIR", tmpDir.Path())
actual, err = decryptEJSON(in)
assert.NoError(t, err)
assert.EqualValues(t, expected, actual)