Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync

diff --cc tools/keep-rsync/keep-rsync.go
index c06fb8a303e3d5ead97d77a12ddeafdf24979a94,1f00a9fdf3a6cf53ed00d9f1719c4006df726d65..72f435650e3a7ce5db1a6491a6fdd3a1201d8731
--- 1/tools/keep-rsync/keep-rsync.go
--- 2/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@@ -92,19 -92,19 +93,22 @@@ func main() 
        if err != nil {
                log.Fatal("Error configurating keep-rsync: %s", err.Error())
        }
 +
 +      // Copy blocks not found in dst from src
 +      performKeepRsync()
  }
  
+ var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
+ 
  // Reads config from file
- func readConfigFromFile(filename string) (map[string]string, error) {
+ func readConfigFromFile(filename string) (arvadosclient.APIConfig, error) {
+       var config arvadosclient.APIConfig
+ 
        content, err := ioutil.ReadFile(filename)
        if err != nil {
-               return nil, err
+               return config, err
        }
  
-       config := make(map[string]string)
        lines := strings.Split(string(content), "\n")
        for _, line := range lines {
                if line == "" {

diff --cc tools/keep-rsync/keep-rsync_test.go
Simple merge