use t.Context() instead of context.TODO() in tests

1 files changed, 10 insertions, 11 deletions

diff --git a/tests/bulk_delete_test.go b/tests/bulk_delete_test.go
index 2e5d909..33f249d 100644
--- a/tests/bulk_delete_test.go
+++ b/tests/bulk_delete_test.go
@@ -19,7 +19,6 @@
 package tests
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -31,28 +30,28 @@ import (
 func TestBulkDeleteSuccess(t *testing.T) {
 	testWithAccount(t, func(a *schwift.Account) {
 		testWithAndWithoutBulkDeleteSupport(func() {
-			c, err := a.Container("schwift-test-bulkdelete").EnsureExists(context.TODO())
+			c, err := a.Container("schwift-test-bulkdelete").EnsureExists(t.Context())
 			expectSuccess(t, err)
-			objs, err := createTestObjects(c)
+			objs, err := createTestObjects(t, c)
 			expectSuccess(t, err)
 
-			numDeleted, numNotFound, err := c.Account().BulkDelete(context.TODO(), objs, nil, nil)
+			numDeleted, numNotFound, err := c.Account().BulkDelete(t.Context(), 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(context.TODO(), objs, nil, nil)
+			numDeleted, numNotFound, err = c.Account().BulkDelete(t.Context(), objs, nil, nil)
 			expectSuccess(t, err)
 			expectInt(t, numDeleted, 0)
 			expectInt(t, numNotFound, len(objs))
 			expectContainerExistence(t, c, true)
 
-			objs, err = createTestObjects(c)
+			objs, err = createTestObjects(t, c)
 			expectSuccess(t, err)
 			cs := []*schwift.Container{c}
 
-			numDeleted, numNotFound, err = c.Account().BulkDelete(context.TODO(), objs, cs, nil)
+			numDeleted, numNotFound, err = c.Account().BulkDelete(t.Context(), objs, cs, nil)
 			expectSuccess(t, err)
 			expectInt(t, numDeleted, len(objs)+1)
 			expectInt(t, numNotFound, 0)
@@ -64,7 +63,7 @@ func TestBulkDeleteSuccess(t *testing.T) {
 func TestBulkDeleteError(t *testing.T) {
 	testWithContainer(t, func(c *schwift.Container) {
 		testWithAndWithoutBulkDeleteSupport(func() {
-			objs, err := createTestObjects(c)
+			objs, err := createTestObjects(t, c)
 			expectSuccess(t, err)
 			objs = objs[1:]
 			cs := []*schwift.Container{c}
@@ -72,7 +71,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(context.TODO(), objs, cs, nil)
+			numDeleted, numNotFound, err := c.Account().BulkDelete(t.Context(), objs, cs, nil)
 			expectInt(t, numDeleted, len(objs))
 			expectInt(t, numNotFound, 0)
 			t.Logf("err = %#v\n", err)
@@ -84,11 +83,11 @@ func TestBulkDeleteError(t *testing.T) {
 	})
 }
 
-func createTestObjects(c *schwift.Container) ([]*schwift.Object, error) {
+func createTestObjects(t *testing.T, 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(context.TODO(), strings.NewReader("example"), nil, nil)
+		err := obj.Upload(t.Context(), strings.NewReader("example"), nil, nil)
 		if err != nil {
 			return nil, err
 		}