rclone/backend/cache/cache_upload_test.go.rej

--- cache_upload_test.go
+++ cache_upload_test.go
@@ -1500,9 +1469,6 @@ func (r *run) cleanupFs(t *testing.T, f fs.Fs, b *cache.Persistent) {
 	}
 	r.tempFiles = nil
 	debug.FreeOSMemory()
-	for k, v := range r.runDefaultFlagMap {
-		_ = flag.Set(k, v)
-	}
 }
 
 func (r *run) randomBytes(t *testing.T, size int64) []byte {
Implement new backend config system This unifies the 3 methods of reading config * command line * environment variable * config file And allows them all to be configured in all places. This is done by making the []fs.Option in the backend registration be the master source of what the backend options are. The backend changes are: * Use the new configmap.Mapper parameter * Use configstruct to parse it into an Options struct * Add all config to []fs.Option including defaults and help * Remove all uses of pflag * Remove all uses of config.FileGet 2018-05-14 19:06:57 +02:00			`--- cache_upload_test.go`
			`+++ cache_upload_test.go`
			`@@ -1500,9 +1469,6 @@ func (r run) cleanupFs(t testing.T, f fs.Fs, b *cache.Persistent) {`
			`}`
			`r.tempFiles = nil`
			`debug.FreeOSMemory()`
			`- for k, v := range r.runDefaultFlagMap {`
			`- _ = flag.Set(k, v)`
			`- }`
			`}`

			`func (r run) randomBytes(t testing.T, size int64) []byte {`