Browse code

Merge pull request #334 from satyap/alias_rm

Alias 'del' as 'rm'

Matt Domsch authored on 2014/05/11 13:08:00
Showing 4 changed files
... ...
@@ -1,6 +1,7 @@
1 1
 *.pyc
2 2
 *.swp
3 3
 testsuite
4
+testsuite-out
4 5
 /MANIFEST
5 6
 /dist
6 7
 build/*
... ...
@@ -316,7 +316,7 @@ if have_encoding:
316 316
 
317 317
 ## ====== List bucket content
318 318
 test_s3cmd("List bucket content", ['ls', '%s/xyz/' % pbucket(1) ],
319
-    must_find_re = [ u"DIR   %s/xyz/binary/$" % pbucket(1) , u"DIR   %s/xyz/etc/$" % pbucket(1) ],
319
+    must_find_re = [ u"DIR +%s/xyz/binary/$" % pbucket(1) , u"DIR +%s/xyz/etc/$" % pbucket(1) ],
320 320
     must_not_find = [ u"random-crap.md5", u"/demo" ])
321 321
 
322 322
 
... ...
@@ -536,6 +536,10 @@ test_s3cmd("Verify move", ['ls', '-r', pbucket(2)],
536 536
 test_s3cmd("Simple delete", ['del', '%s/xyz/etc2/Logo.PNG' % pbucket(1)],
537 537
     must_find = [ "File %s/xyz/etc2/Logo.PNG deleted" % pbucket(1) ])
538 538
 
539
+## ====== Simple delete with rm
540
+test_s3cmd("Simple delete with rm", ['rm', '%s/xyz/test_rm/TypeRa.ttf' % pbucket(1)],
541
+    must_find = [ "File %s/xyz/test_rm/TypeRa.ttf deleted" % pbucket(1) ])
542
+
539 543
 ## ====== Create expiration rule with days and prefix
540 544
 test_s3cmd("Create expiration rule with days and prefix", ['expire', pbucket(1), '--expiry-days=365', '--expiry-prefix=log/'],
541 545
     must_find = [ "Bucket '%s/': expiration configuration is set." % pbucket(1)])
... ...
@@ -570,6 +574,12 @@ test_s3cmd("Recursive delete", ['del', '--recursive', '--exclude', 'Atomic*', '%
570 570
     must_find_re = [ "File .*/etc/logo.png deleted" ],
571 571
     must_not_find = [ "AtomicClockRadio.ttf" ])
572 572
 
573
+## ====== Recursive delete with rm
574
+test_s3cmd("Recursive delete with rm", ['rm', '--recursive', '--exclude', 'Atomic*', '%s/xyz/test_rm' % pbucket(1)],
575
+    must_find = [ "File %s/xyz/test_rm/more/give-me-more.txt deleted" % pbucket(1) ],
576
+    must_find_re = [ "File .*/test_rm/logo.png deleted" ],
577
+    must_not_find = [ "AtomicClockRadio.ttf" ])
578
+
573 579
 ## ====== Recursive delete all
574 580
 test_s3cmd("Recursive delete all", ['del', '--recursive', '--force', pbucket(1)],
575 581
     must_find_re = [ "File .*binary/random-crap deleted" ])
... ...
@@ -1948,6 +1948,7 @@ def get_commands_list():
1948 1948
     {"cmd":"put", "label":"Put file into bucket", "param":"FILE [FILE...] s3://BUCKET[/PREFIX]", "func":cmd_object_put, "argc":2},
1949 1949
     {"cmd":"get", "label":"Get file from bucket", "param":"s3://BUCKET/OBJECT LOCAL_FILE", "func":cmd_object_get, "argc":1},
1950 1950
     {"cmd":"del", "label":"Delete file from bucket", "param":"s3://BUCKET/OBJECT", "func":cmd_object_del, "argc":1},
1951
+    {"cmd":"rm", "label":"Delete file from bucket (alias for del)", "param":"s3://BUCKET/OBJECT", "func":cmd_object_del, "argc":1},
1951 1952
     #{"cmd":"mkdir", "label":"Make a virtual S3 directory", "param":"s3://BUCKET/path/to/dir", "func":cmd_mkdir, "argc":1},
1952 1953
     {"cmd":"restore", "label":"Restore file from Glacier storage", "param":"s3://BUCKET/OBJECT", "func":cmd_object_restore, "argc":1},
1953 1954
     {"cmd":"sync", "label":"Synchronize a directory tree to S3", "param":"LOCAL_DIR s3://BUCKET[/PREFIX] or s3://BUCKET[/PREFIX] LOCAL_DIR", "func":cmd_sync, "argc":2},
1954 1955
Binary files a/testsuite.tar.gz and b/testsuite.tar.gz differ