generalize cleanup phase of object test

2 files changed, 6 insertions, 10 deletions

diff --git a/object_iterator_test.go b/object_iterator_test.go
index 4a2387d..86a96e9 100644
--- a/object_iterator_test.go
+++ b/object_iterator_test.go
@@ -128,13 +128,6 @@ func TestObjectIterator(t *testing.T) {
 		ois, err = iter.CollectDetailed()
 		expectSuccess(t, err)
 		expectObjectInfos(t, ois, oname(1), oname(2), oname(3), oname(4))
-
-		//cleanup
-		iter = c.Objects()
-		iter.Prefix = "schwift-test-listing"
-		expectSuccess(t, iter.Foreach(func(o *Object) error {
-			return o.Delete(nil, nil)
-		}))
 	})
 }
 
diff --git a/shared_test.go b/shared_test.go
index 91a9727..2bc5bee 100644
--- a/shared_test.go
+++ b/shared_test.go
@@ -102,16 +102,19 @@ func testWithContainer(t *testing.T, testCode func(c *Container)) {
 	testWithAccount(t, func(a *Account) {
 		containerName := getRandomName()
 		container, err := a.Container(containerName).EnsureExists()
-		expectError(t, err, "")
+		expectSuccess(t, err)
 
 		testCode(container)
 
 		//cleanup
 		exists, err := container.Exists()
-		expectError(t, err, "")
+		expectSuccess(t, err)
 		if exists {
+			expectSuccess(t, container.Objects().Foreach(func(o *Object) error {
+				return o.Delete(nil, nil)
+			}))
 			err = container.Delete(nil, nil)
-			expectError(t, err, "")
+			expectSuccess(t, err)
 		}
 	})
 }