From e17c56a71437ff2817391719a553114def5e4e1b Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Tue, 26 Jul 2011 09:47:06 -0700 Subject: [PATCH] Say ".yaml" not ".yml". This is not MS-DOS, and YML is a Yahoo XML dialect. --- .gitignore | 2 +- config.yml.SAMPLE => config.yaml.SAMPLE | 0 s3tests/generate_objects.py | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename config.yml.SAMPLE => config.yaml.SAMPLE (100%) diff --git a/.gitignore b/.gitignore index af45817..bcbae80 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ /*.egg-info /virtualenv -config.yml +config.yaml diff --git a/config.yml.SAMPLE b/config.yaml.SAMPLE similarity index 100% rename from config.yml.SAMPLE rename to config.yaml.SAMPLE diff --git a/s3tests/generate_objects.py b/s3tests/generate_objects.py index 47b8d1a..443db7a 100644 --- a/s3tests/generate_objects.py +++ b/s3tests/generate_objects.py @@ -57,10 +57,10 @@ def upload_objects(bucket, files, seed): def _main(): '''To run the static content load test, make sure you've bootstrapped your - test environment and set up your config.yml file, then run the following: - S3TEST_CONF=config.yml virtualenv/bin/python generate_objects.py -O urls.txt --seed 1234 + test environment and set up your config.yaml file, then run the following: + S3TEST_CONF=config.yaml virtualenv/bin/python generate_objects.py -O urls.txt --seed 1234 - This creates a bucket with your S3 credentials (from config.yml) and + This creates a bucket with your S3 credentials (from config.yaml) and fills it with garbage objects as described in generate_objects.conf. It writes a list of URLS to those objects to ./urls.txt.