community
/
rclone
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -verbose flag to unit tests and add some more eventual consistency retries

This commit is contained in:
Nick Craig-Wood 2016-01-20 20:06:05 +00:00
parent ce305321b6
commit de3cf5e8d7
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fstest/fstests/fstests.go
View File

@ -38,10 +38,13 @@ var (
Path: `hello? sausage/êé/Hello, 世界/ " ' @ < > & ?/z.txt`, Path: `hello? sausage/êé/Hello, 世界/ " ' @ < > & ?/z.txt`,
WinPath: `hello_ sausage/êé/Hello, 世界/ _ ' @ _ _ & _/z.txt`, WinPath: `hello_ sausage/êé/Hello, 世界/ _ ' @ _ _ & _/z.txt`,
} }
verbose = flag.Bool("verbose", false, "Set to enable logging")
dumpHeaders = flag.Bool("dump-headers", false, "Dump HTTP headers - may contain sensitive info") 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") dumpBodies = flag.Bool("dump-bodies", false, "Dump HTTP headers and bodies - may contain sensitive info")
) )
const eventualConsistencyRetries = 10
func init() { func init() {
flag.StringVar(&RemoteName, "remote", "", "Set this to override the default remote name (eg s3:)") flag.StringVar(&RemoteName, "remote", "", "Set this to override the default remote name (eg s3:)")
} }
@ -50,8 +53,8 @@ func init() {
func TestInit(t *testing.T) { func TestInit(t *testing.T) {
var err error var err error
fs.LoadConfig() fs.LoadConfig()
fs.Config.Verbose = false fs.Config.Verbose = *verbose
fs.Config.Quiet = true fs.Config.Quiet = !*verbose
fs.Config.DumpHeaders = *dumpHeaders fs.Config.DumpHeaders = *dumpHeaders
fs.Config.DumpBodies = *dumpBodies fs.Config.DumpBodies = *dumpBodies
t.Logf("Using remote %q", RemoteName) t.Logf("Using remote %q", RemoteName)
@ -138,13 +141,12 @@ func TestFsNewFsObjectNotFound(t *testing.T) {
func findObject(t *testing.T, Name string) fs.Object { func findObject(t *testing.T, Name string) fs.Object {
var obj fs.Object var obj fs.Object
const retries = 10 for i := 1; i <= eventualConsistencyRetries; i++ {
for i := 1; i <= retries; i++ {
obj = remote.NewFsObject(Name) obj = remote.NewFsObject(Name)
if obj != nil { if obj != nil {
break break
} }
t.Logf("Sleeping for 1 second for findObject eventual consistency: %d/%d", i, retries) t.Logf("Sleeping for 1 second for findObject eventual consistency: %d/%d", i, eventualConsistencyRetries)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
if obj == nil { if obj == nil {
@ -186,12 +188,19 @@ func TestFsPutFile2(t *testing.T) {
func TestFsListDirFile2(t *testing.T) { func TestFsListDirFile2(t *testing.T) {
skipIfNotOk(t) skipIfNotOk(t)
found := false found := false
for obj := range remote.ListDir() { for i := 1; i <= eventualConsistencyRetries; i++ {
if obj.Name != `hello? sausage` && obj.Name != `hello_ sausage` { for obj := range remote.ListDir() {
t.Errorf("Found unexpected item %q", obj.Name) if obj.Name != `hello? sausage` && obj.Name != `hello_ sausage` {
} else { t.Errorf("Found unexpected item %q", obj.Name)
found = true } else {
found = true
}
} }
if found {
break
}
t.Logf("Sleeping for 1 second for TestFsListDirFile2 eventual consistency: %d/%d", i, eventualConsistencyRetries)
time.Sleep(1 * time.Second)
} }
if !found { if !found {
t.Errorf("Didn't find %q", `hello? sausage`) t.Errorf("Didn't find %q", `hello? sausage`)