Browse code

* run-tests.py: Fixed for new messages.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@373 830e0280-6d2a-0410-9c65-932aecc39d9d

Michal Ludvig authored on 2009/02/14 15:58:15
Showing 2 changed files
... ...
@@ -1,5 +1,9 @@
1 1
 2009-02-14  Michal Ludvig  <michal@logix.cz>
2 2
 
3
+	* run-tests.py: Fixed for new messages.
4
+
5
+2009-02-14  Michal Ludvig  <michal@logix.cz>
6
+
3 7
 	* README: Updated for 0.9.9
4 8
 	* s3cmd, S3/PkgInfo.py, s3cmd.1: Replaced project 
5 9
 	  URLs with http://s3tools.org
... ...
@@ -297,14 +297,14 @@ test_s3cmd("Sync more to S3", ['sync', 'testsuite/', 's3://s3cmd-autotest-1/xyz/
297 297
 
298 298
 ## ====== Rename within S3
299 299
 test_s3cmd("Rename within S3", ['mv', 's3://s3cmd-autotest-1/xyz/etc/logo.png', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG'],
300
-	must_find = [ 'Object s3://s3cmd-autotest-1/xyz/etc/logo.png moved to s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG' ])
300
+	must_find = [ 'File s3://s3cmd-autotest-1/xyz/etc/logo.png moved to s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG' ])
301 301
 
302 302
 
303 303
 ## ====== Rename (NoSuchKey)
304 304
 test_s3cmd("Rename (NoSuchKey)", ['mv', 's3://s3cmd-autotest-1/xyz/etc/logo.png', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG'],
305 305
 	retcode = 1,
306 306
 	must_find_re = [ 'ERROR:.*NoSuchKey' ],
307
-	must_not_find = [ 'Object s3://s3cmd-autotest-1/xyz/etc/logo.png moved to s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG' ])
307
+	must_not_find = [ 'File s3://s3cmd-autotest-1/xyz/etc/logo.png moved to s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG' ])
308 308
 
309 309
 
310 310
 ## ====== Sync more from S3
... ...
@@ -336,22 +336,22 @@ test_s3cmd("Get multiple files", ['get', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PN
336 336
 
337 337
 ## ====== Copy between buckets
338 338
 test_s3cmd("Copy between buckets", ['cp', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG', 's3://s3cmd-Autotest-3'],
339
-	must_find = [ "Object s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG copied to s3://s3cmd-Autotest-3/xyz/etc2/Logo.PNG" ])
339
+	must_find = [ "File s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG copied to s3://s3cmd-Autotest-3/xyz/etc2/Logo.PNG" ])
340 340
 
341 341
 
342 342
 ## ====== Simple delete
343 343
 test_s3cmd("Simple delete", ['del', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG'],
344
-	must_find = [ "Object s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG deleted" ])
344
+	must_find = [ "File s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG deleted" ])
345 345
 
346 346
 
347 347
 ## ====== Recursive delete
348 348
 test_s3cmd("Recursive delete", ['del', '--recursive', 's3://s3cmd-autotest-1/xyz/etc'],
349
-	must_find_re = [ "Object.*\.svn/format deleted" ])
349
+	must_find_re = [ "File .*\.svn/format deleted" ])
350 350
 
351 351
 
352 352
 ## ====== Recursive delete all
353 353
 test_s3cmd("Recursive delete all", ['del', '--recursive', '--force', 's3://s3cmd-autotest-1'],
354
-	must_find_re = [ "Object.*binary/random-crap deleted" ])
354
+	must_find_re = [ "File .*binary/random-crap deleted" ])
355 355
 
356 356
 
357 357
 ## ====== Remove empty bucket