git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/branches/0.9.8.x@250 830e0280-6d2a-0410-9c65-932aecc39d9d
Michal Ludvig authored on 2008/11/06 15:23:15... | ... |
@@ -1,3 +1,8 @@ |
1 |
+2008-11-06 Michal Ludvig <michal@logix.cz> |
|
2 |
+ |
|
3 |
+ * run-tests.sh: Use unique bucket name for testing. Apparently someone |
|
4 |
+ else snatched my favourite s3://s3cmd-autotest :-D |
|
5 |
+ |
|
1 | 6 |
2008-11-05 Michal Ludvig <michal@logix.cz> |
2 | 7 |
|
3 | 8 |
* S3/S3.py, S3/Exception.py: Re-issue failed requests in S3.send_request() |
... | ... |
@@ -1,12 +1,17 @@ |
1 | 1 |
#!/bin/sh |
2 | 2 |
set -e -x |
3 | 3 |
|
4 |
-./s3cmd mb s3://s3cmd-autotest |
|
5 |
-./s3cmd ls s3://s3cmd-autotest |
|
6 |
-./s3cmd put s3cmd s3cmd.1 s3://s3cmd-autotest |
|
7 |
-./s3cmd ls s3://s3cmd-autotest |
|
8 |
-./s3cmd del s3://s3cmd-autotest/s3cmd.1 |
|
9 |
-./s3cmd get s3://s3cmd-autotest/s3cmd s3cmd.get |
|
4 |
+TEST_BUCKET="s3://s3cmd-autotest-$(id -un)-$(date +%s)" |
|
5 |
+echo "Using test bucket: ${TEST_BUCKET}" |
|
6 |
+echo |
|
7 |
+sleep 1 |
|
8 |
+ |
|
9 |
+./s3cmd mb ${TEST_BUCKET} |
|
10 |
+./s3cmd ls ${TEST_BUCKET} |
|
11 |
+./s3cmd put s3cmd s3cmd.1 ${TEST_BUCKET} |
|
12 |
+./s3cmd ls ${TEST_BUCKET} |
|
13 |
+./s3cmd del ${TEST_BUCKET}/s3cmd.1 |
|
14 |
+./s3cmd get ${TEST_BUCKET}/s3cmd s3cmd.get |
|
10 | 15 |
diff s3cmd s3cmd.get |
11 | 16 |
rm -fv s3cmd.get |
12 | 17 |
|
... | ... |
@@ -19,24 +24,24 @@ set -x |
19 | 19 |
VER=$(./s3cmd --version | cut -d\ -f3) |
20 | 20 |
tar xvfz dist/s3cmd-${VER}.tar.gz |
21 | 21 |
echo "Will be removed" > s3cmd-${VER}/file.to.remove |
22 |
-./s3cmd sync s3cmd-${VER} s3://s3cmd-autotest/sync-test |
|
22 |
+./s3cmd sync s3cmd-${VER} ${TEST_BUCKET}/sync-test |
|
23 | 23 |
echo "Added file" > s3cmd-${VER}/added.file |
24 | 24 |
rm -f s3cmd-${VER}/file.to.remove |
25 |
-./s3cmd sync --delete s3cmd-${VER} s3://s3cmd-autotest/sync-test |
|
25 |
+./s3cmd sync --delete s3cmd-${VER} ${TEST_BUCKET}/sync-test |
|
26 | 26 |
rm -f s3cmd-${VER}/S3/PkgInfo.py |
27 | 27 |
rm -f s3cmd-${VER}/s3cmd |
28 |
-./s3cmd sync --delete --exclude "/s3cmd-${VER}/S3/*" s3://s3cmd-autotest/sync-test s3cmd-${VER} |
|
28 |
+./s3cmd sync --delete --exclude "/s3cmd-${VER}/S3/*" ${TEST_BUCKET}/sync-test s3cmd-${VER} |
|
29 | 29 |
rm -rf s3cmd-${VER} |
30 | 30 |
|
31 |
-./s3cmd rb s3://s3cmd-autotest/ || true |
|
31 |
+./s3cmd rb ${TEST_BUCKET}/ || true |
|
32 | 32 |
# ERROR: S3 error: 409 (Conflict): BucketNotEmpty |
33 | 33 |
|
34 | 34 |
# hack to remove all objects from a bucket |
35 | 35 |
mkdir empty |
36 |
-./s3cmd sync --delete empty/ s3://s3cmd-autotest |
|
36 |
+./s3cmd sync --delete empty/ ${TEST_BUCKET} |
|
37 | 37 |
rm -rf empty |
38 | 38 |
|
39 |
-./s3cmd rb s3://s3cmd-autotest/ |
|
39 |
+./s3cmd rb ${TEST_BUCKET}/ |
|
40 | 40 |
|
41 | 41 |
set +x |
42 | 42 |
|