KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

Reset password/config path in config tests to fix other tests

Browse source
This commit is contained in:
Nick Craig-Wood 2016-02-29 21:43:37 +00:00
parent dfc7cd97a3
commit 41eb386063
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/config_test.go
View file

@ -79,8 +79,12 @@ func TestReveal(t *testing.T) {
} }
func TestConfigLoad(t *testing.T) { func TestConfigLoad(t *testing.T) {
oldConfigPath := ConfigPath
ConfigPath = "./testdata/plain.conf" ConfigPath = "./testdata/plain.conf"
configKey = nil defer func() {
ConfigPath = oldConfigPath
}()
configKey = nil // reset password
c, err := loadConfigFile() c, err := loadConfigFile()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -100,7 +104,12 @@ func TestConfigLoad(t *testing.T) {
func TestConfigLoadEncrypted(t *testing.T) { func TestConfigLoadEncrypted(t *testing.T) {
var err error var err error
oldConfigPath := ConfigPath
ConfigPath = "./testdata/encrypted.conf" ConfigPath = "./testdata/encrypted.conf"
defer func() {
ConfigPath = oldConfigPath
configKey = nil // reset password
}()
// Set correct password // Set correct password
err = setPassword("asdf") err = setPassword("asdf")
@ -128,7 +137,9 @@ func TestConfigLoadEncryptedFailures(t *testing.T) {
var err error var err error
// This file should be too short to be decoded. // This file should be too short to be decoded.
oldConfigPath := ConfigPath
ConfigPath = "./testdata/enc-short.conf" ConfigPath = "./testdata/enc-short.conf"
defer func() { ConfigPath = oldConfigPath }()
_, err = loadConfigFile() _, err = loadConfigFile()
if err == nil { if err == nil {
t.Fatal("expected error") t.Fatal("expected error")
@ -163,6 +174,9 @@ func TestConfigLoadEncryptedFailures(t *testing.T) {
} }
func TestPassword(t *testing.T) { func TestPassword(t *testing.T) {
defer func() {
configKey = nil // reset password
}()
var err error var err error
// Empty password should give error // Empty password should give error
err = setPassword(" \t ") err = setPassword(" \t ")