Merge lp:~greglange/swift/lp655401 into lp:~hudson-openstack/swift/trunk

[Greg Lange]

swift-bench to clean up containers after it's done.

[lp:~greglange/swift/lp655401]

267. By Greg Lange <email address hidden> on 2011-04-13

should probably let the user know when a container delete fails for reasons other than having objects in it

268. By Greg Lange <email address hidden> on 2011-04-14

moving deleting of containers to run() method makes more sense

=== modified file 'swift/common/bench.py'
--- swift/common/bench.py	2011-01-29 03:00:01 +0000
+++ swift/common/bench.py	2011-04-14 15:39:39 +0000
@@ -147,6 +147,16 @@
         self.total = len(names)
         self.msg = 'DEL'
 
+    def run(self):
+        Bench.run(self)
+        for container in self.containers:
+            try:
+                client.delete_container(self.url, self.token, container)
+            except client.ClientException, e:
+                if e.http_status != 409:
+                    self._log_status("Unable to delete container '%s'. " \
+                        "Got http status '%d'." % (container, e.http_status))
+
     def _run(self, thread):
         if time.time() - self.heartbeat >= 15:
             self.heartbeat = time.time()