Merge pull request #130 from taskcluster/bug1506621

Bug 1506621 - update code to use new (v3) github.com/mholt/archiver interface

mounts.go

@@ -650,13 +650,13 @@ func extract(fsContent FSContent, format string, dir string, task *TaskRun) erro
 	task.Infof("[mounts] Extracting %v file %v to '%v'", format, cacheFile, dir)
 	switch format {
 	case "zip":
-		return archiver.Zip.Open(cacheFile, dir)
+		return archiver.DefaultZip.Unarchive(cacheFile, dir)
 	case "tar.gz":
-		return archiver.TarGz.Open(cacheFile, dir)
+		return archiver.DefaultTarGz.Unarchive(cacheFile, dir)
 	case "rar":
-		return archiver.Rar.Open(cacheFile, dir)
+		return archiver.DefaultRar.Unarchive(cacheFile, dir)
 	case "tar.bz2":
-		return archiver.TarBz2.Open(cacheFile, dir)
+		return archiver.DefaultTarBz2.Unarchive(cacheFile, dir)
 	}
 	log.Fatalf("Unsupported format %v", format)
 	return fmt.Errorf("Unsupported archive format %v", format)

mounts_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -472,6 +473,10 @@ func LogTest(m *MountsLoggingTestCase) {
 				m.Test.Fatalf("Was expecting log line to match pattern '%v', but it does not:\n%v", run[i], mountsLogLines[i])
 			}
 		}
+		err = os.RemoveAll(taskContext.TaskDir)
+		if err != nil {
+			m.Test.Fatalf("Could not delete task directory: %v", err)
+		}
 	}
 }