fstest: make RandomRemoteName shorter

Use 12 random characters instead of 24, to avoid trouble on the bisync tests
This commit is contained in:
nielash 2024-04-22 19:34:20 -04:00 committed by Nick Craig-Wood
parent 9c287c72d6
commit 3ae4534ce6
2 changed files with 4 additions and 4 deletions

View file

@ -48,7 +48,7 @@ var (
// ListRetries is the number of times to retry a listing to overcome eventual consistency // ListRetries is the number of times to retry a listing to overcome eventual consistency
ListRetries = flag.Int("list-retries", 3, "Number or times to retry listing") ListRetries = flag.Int("list-retries", 3, "Number or times to retry listing")
// MatchTestRemote matches the remote names used for testing // MatchTestRemote matches the remote names used for testing
MatchTestRemote = regexp.MustCompile(`^rclone-test-[abcdefghijklmnopqrstuvwxyz0123456789]{24}$`) MatchTestRemote = regexp.MustCompile(`^rclone-test-[abcdefghijklmnopqrstuvwxyz0123456789]{12}$`)
) )
// Initialise rclone for testing // Initialise rclone for testing
@ -266,7 +266,7 @@ func CheckListingWithRoot(t *testing.T, f fs.Fs, dir string, items []Item, expec
var objs []fs.Object var objs []fs.Object
var dirs []fs.Directory var dirs []fs.Directory
var err error var err error
var retries = *ListRetries retries := *ListRetries
sleep := time.Second / 2 sleep := time.Second / 2
wantListing := makeListingFromItems(items) wantListing := makeListingFromItems(items)
gotListing := "<unset>" gotListing := "<unset>"
@ -431,7 +431,7 @@ func RandomRemoteName(remoteName string) (string, string, error) {
if !strings.HasSuffix(remoteName, ":") { if !strings.HasSuffix(remoteName, ":") {
remoteName += "/" remoteName += "/"
} }
leafName = "rclone-test-" + random.String(24) leafName = "rclone-test-" + random.String(12)
if !MatchTestRemote.MatchString(leafName) { if !MatchTestRemote.MatchString(leafName) {
log.Fatalf("%q didn't match the test remote name regexp", leafName) log.Fatalf("%q didn't match the test remote name regexp", leafName)
} }

View file

@ -17,7 +17,7 @@ import (
// MatchTestRemote matches the remote names used for testing (copied // MatchTestRemote matches the remote names used for testing (copied
// from fstest/fstest.go so we don't have to import that and get all // from fstest/fstest.go so we don't have to import that and get all
// its flags) // its flags)
var MatchTestRemote = regexp.MustCompile(`^rclone-test-[abcdefghijklmnopqrstuvwxyz0123456789]{24}(_segments)?$`) var MatchTestRemote = regexp.MustCompile(`^rclone-test-[abcdefghijklmnopqrstuvwxyz0123456789]{12,24}(_segments)?$`)
// cleanFs runs a single clean fs for left over directories // cleanFs runs a single clean fs for left over directories
func cleanFs(ctx context.Context, remote string, cleanup bool) error { func cleanFs(ctx context.Context, remote string, cleanup bool) error {