Merge pull request #19 from SuperSandro2000/context

Remove context from struct, add ctx as first args to many functions

1 files changed, 7 insertions, 6 deletions

diff --git a/tests/bulk_delete_test.go b/tests/bulk_delete_test.go
index 0643a7c..102d092 100644
--- a/tests/bulk_delete_test.go
+++ b/tests/bulk_delete_test.go
@@ -19,6 +19,7 @@
 package tests
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -30,18 +31,18 @@ import (
 func TestBulkDeleteSuccess(t *testing.T) {
 	testWithAccount(t, func(a *schwift.Account) {
 		testWithAndWithoutBulkDeleteSupport(func() {
-			c, err := a.Container("schwift-test-bulkdelete").EnsureExists()
+			c, err := a.Container("schwift-test-bulkdelete").EnsureExists(context.TODO())
 			expectSuccess(t, err)
 			objs, err := createTestObjects(c)
 			expectSuccess(t, err)
 
-			numDeleted, numNotFound, err := c.Account().BulkDelete(objs, nil, nil)
+			numDeleted, numNotFound, err := c.Account().BulkDelete(context.TODO(), objs, nil, nil)
 			expectSuccess(t, err)
 			expectInt(t, numDeleted, len(objs))
 			expectInt(t, numNotFound, 0)
 			expectContainerExistence(t, c, true)
 
-			numDeleted, numNotFound, err = c.Account().BulkDelete(objs, nil, nil)
+			numDeleted, numNotFound, err = c.Account().BulkDelete(context.TODO(), objs, nil, nil)
 			expectSuccess(t, err)
 			expectInt(t, numDeleted, 0)
 			expectInt(t, numNotFound, len(objs))
@@ -51,7 +52,7 @@ func TestBulkDeleteSuccess(t *testing.T) {
 			expectSuccess(t, err)
 			cs := []*schwift.Container{c}
 
-			numDeleted, numNotFound, err = c.Account().BulkDelete(objs, cs, nil)
+			numDeleted, numNotFound, err = c.Account().BulkDelete(context.TODO(), objs, cs, nil)
 			expectSuccess(t, err)
 			expectInt(t, numDeleted, len(objs)+1)
 			expectInt(t, numNotFound, 0)
@@ -71,7 +72,7 @@ func TestBulkDeleteError(t *testing.T) {
 			// not deleting all objects should lead to 409 Conflict when deleting the Container
 			// (NOTE: actual Swift returns 400 here although I don't understand why
 			// even after reading its code)
-			numDeleted, numNotFound, err := c.Account().BulkDelete(objs, cs, nil)
+			numDeleted, numNotFound, err := c.Account().BulkDelete(context.TODO(), objs, cs, nil)
 			expectInt(t, numDeleted, len(objs))
 			expectInt(t, numNotFound, 0)
 			t.Logf("err = %#v\n", err)
@@ -87,7 +88,7 @@ func createTestObjects(c *schwift.Container) ([]*schwift.Object, error) {
 	var objs []*schwift.Object
 	for idx := 1; idx <= 5; idx++ {
 		obj := c.Object(fmt.Sprintf("object%d", idx))
-		err := obj.Upload(strings.NewReader("example"), nil, nil)
+		err := obj.Upload(context.TODO(), strings.NewReader("example"), nil, nil)
 		if err != nil {
 			return nil, err
 		}