From bdc19b7c8a20859e04dea790b22d8375f164511d Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 1 Jun 2017 22:55:10 +0100 Subject: [PATCH] fstests: fix -remote flag to override test target --- fstest/fstests/fstests.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fstest/fstests/fstests.go b/fstest/fstests/fstests.go index 2e81b5013..6448531e8 100644 --- a/fstest/fstests/fstests.go +++ b/fstest/fstests/fstests.go @@ -45,19 +45,16 @@ var ( Path: `hello? sausage/êé/Hello, 世界/ " ' @ < > & ? + ≠/z.txt`, WinPath: `hello_ sausage/êé/Hello, 世界/ _ ' @ _ _ & _ + ≠/z.txt`, } - file2Contents = "" - verbose = flag.Bool("verbose", false, "Set to enable logging") - dumpHeaders = flag.Bool("dump-headers", false, "Dump HTTP headers - may contain sensitive info") - dumpBodies = flag.Bool("dump-bodies", false, "Dump HTTP headers and bodies - may contain sensitive info") + file2Contents = "" + verbose = flag.Bool("verbose", false, "Set to enable logging") + dumpHeaders = flag.Bool("dump-headers", false, "Dump HTTP headers - may contain sensitive info") + dumpBodies = flag.Bool("dump-bodies", false, "Dump HTTP headers and bodies - may contain sensitive info") + overrideRemote = flag.String("remote", "", "Set this to override the default remote name (eg s3:)") ) // ExtraConfigItem describes a config item added on the fly while testing type ExtraConfigItem struct{ Name, Key, Value string } -func init() { - flag.StringVar(&RemoteName, "remote", "", "Set this to override the default remote name (eg s3:)") -} - // TestInit tests basic intitialisation func TestInit(t *testing.T) { var err error @@ -76,6 +73,9 @@ func TestInit(t *testing.T) { } fs.Config.DumpHeaders = *dumpHeaders fs.Config.DumpBodies = *dumpBodies + if *overrideRemote != "" { + RemoteName = *overrideRemote + } t.Logf("Using remote %q", RemoteName) if RemoteName == "" { RemoteName, err = fstest.LocalRemote()