Merge pull request #187 from efiop/master

travis: enable aws tests

.travis.yml

@@ -36,7 +36,6 @@ install:
   - pip install -r test-requirements.txt
   - git config --global user.email "[email protected]"
   - git config --global user.name "DVC Tester"
-  - mkdir -p ~/.aws && printf "[default]\naws_access_key_id = ABCDEFG\naws_secret_access_key = 123456789" > ~/.aws/credentials
 script:
   - ./unittests.sh
   - ./functests.sh

functest/test-import.sh

@@ -14,9 +14,7 @@ dvc_info "Import from http url"
 dvc import $DATA_S3/Tags.xml data/http
 dvc_check_files "data/http"
 
-# Temporarily disabled for travis builds, as
-# they don't have aws credentials setup yet.
-if [ -z $TRAVIS ]; then
+if [ -z $TRAVIS_PULL_REQUEST ]; then
 	dvc_info "Import from s3 url"
 	dvc config aws.region $REGION
 	dvc import s3://dataversioncontrol/functests/stackoverflow_raw_small/Tags.xml data/s3

functest/test-sync-aws.sh

@@ -4,7 +4,7 @@ set -e
 
 source common.sh
 
-if [ -z $TRAVIS ]; then
+if [ -z $TRAVIS_PULL_REQUEST ]; then
 	dvc_create_repo
 
 	dvc_info "Setting up AWS cloud"
@@ -34,8 +34,6 @@ if [ -z $TRAVIS ]; then
 	dvc status data/xml
 
 	dvc_clean_cloud_aws
-else
-	dvc_info "AWS test is disabled for travis"
 fi
 
 dvc_pass