Fix leftover bucket in tests and add cleanup mode

b2_test.go

@@ -5,8 +5,11 @@ import (
 	"crypto/tls"
 	"encoding/hex"
 	"errors"
+	"flag"
+	"log"
 	"net/http"
 	"os"
+	"strings"
 	"sync"
 	"testing"
 
@@ -42,6 +45,41 @@ func getClient(t *testing.T) *b2.Client {
 	return c
 }
 
+var cleanup = flag.Bool("cleanup", false, "Delete all test-* buckets on start.")
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+
+	if *cleanup {
+		c := getClient(nil)
+		buckets, err := c.Buckets()
+		if err != nil {
+			log.Fatal(err)
+		}
+		for _, b := range buckets {
+			if !strings.HasPrefix(b.Name, "test-") {
+				continue
+			}
+			log.Println("Deleting bucket", b.Name)
+			l := b.ListFilesVersions("", "")
+			for l.Next() {
+				fi := l.FileInfo()
+				if err := c.DeleteFile(fi.ID, fi.Name); err != nil {
+					log.Fatal(err)
+				}
+			}
+			if err := l.Err(); err != nil {
+				log.Fatal(err)
+			}
+			if err := b.Delete(); err != nil {
+				log.Fatal(err)
+			}
+		}
+	}
+
+	os.Exit(m.Run())
+}
+
 func TestBucketLifecycle(t *testing.T) {
 	c := getClient(t)
 

file_test.go

@@ -27,10 +27,16 @@ func getBucket(t *testing.T, c *b2.Client) *b2.BucketInfo {
 	return b
 }
 
+func deleteBucket(t *testing.T, b *b2.BucketInfo) {
+	if err := b.Delete(); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestFileLifecycle(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	file := make([]byte, 123456)
 	rand.Read(file)
@@ -121,15 +127,17 @@ func TestFileLifecycle(t *testing.T) {
 func TestFileListing(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	file := make([]byte, 1234)
 	rand.Read(file)
 
 	for i := 0; i < 2; i++ {
-		if _, err := b.Upload(bytes.NewReader(file), "test-3", ""); err != nil {
+		fi, err := b.Upload(bytes.NewReader(file), "test-3", "")
+		if err != nil {
 			t.Fatal(err)
 		}
+		defer c.DeleteFile(fi.ID, fi.Name)
 	}
 
 	var fileIDs []string
@@ -138,6 +146,7 @@ func TestFileListing(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		defer c.DeleteFile(fi.ID, fi.Name)
 		fileIDs = append(fileIDs, fi.ID)
 	}
 

upload_test.go

@@ -12,7 +12,7 @@ import (
 func TestUploadError(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	file := make([]byte, 123456)
 	rand.Read(file)
@@ -26,7 +26,7 @@ func TestUploadError(t *testing.T) {
 func TestUploadFile(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	tmpfile, err := ioutil.TempFile("", "b2")
 	if err != nil {
@@ -65,7 +65,7 @@ func TestUploadFile(t *testing.T) {
 func TestUploadBuffer(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	content := make([]byte, 123456)
 	rand.Read(content)
@@ -86,7 +86,7 @@ func TestUploadBuffer(t *testing.T) {
 func TestUploadReader(t *testing.T) {
 	c := getClient(t)
 	b := getBucket(t, c)
-	defer b.Delete()
+	defer deleteBucket(t, b)
 
 	content := make([]byte, 123456)
 	rand.Read(content)