Merge pull request #730 from smira/s3-creds

Replace S3 creds

.travis.yml

@@ -20,9 +20,10 @@ addons:
 env:
   global:
     - secure: "YSwtFrMqh4oUvdSQTXBXMHHLWeQgyNEL23ChIZwU0nuDGIcQZ65kipu0PzefedtUbK4ieC065YCUi4UDDh6gPotB/Wu1pnYg3dyQ7rFvhaVYAAUEpajAdXZhlx+7+J8a4FZMeC/kqiahxoRgLbthF9019ouIqhGB9zHKI6/yZwc="
-    - secure: "V7OjWrfQ8UbktgT036jYQPb/7GJT3Ol9LObDr8FYlzsQ+F1uj2wLac6ePuxcOS4FwWOJinWGM1h+JiFkbxbyFqfRNJ0jj0O2p93QyDojxFVOn1mXqqvV66KFqAWR2Vzkny/gDvj8LTvdB1cgAIm2FNOkQc6E1BFnyWS2sN9ea5E="
+    - secure: "EcCzJsqQ3HnIkprBPS1YHErsETcb7KQFBYEzVDE7RYDApWeapLq+r/twMtWMd/fkGeLzr3kWSg7nhSadeHMLYeMl9j+U7ncC5CWG5NMBOj/jowlb9cMCCDlmzMoZLAgR6jm1cJyrWCLsWVlv+D0ZiB0fx4xaBZP/gIr9g6nEwC8="
     - secure: "OxiVNmre2JzUszwPNNilKDgIqtfX2gnRSsVz6nuySB1uO2yQsOQmKWJ9cVYgH2IB5H8eWXKOhexcSE28kz6TPLRuEcU9fnqKY3uEkdwm7rJfz9lf+7C4bJEUdA1OIzJppjnWUiXxD7CEPL1DlnMZM24eDQYqa/4WKACAgkK53gE="
     - NO_FTP_ACCESS: "yes"
+    - BOTO_CONFIG: /dev/null
 before_install:
   - virtualenv system/env
   - . system/env/bin/activate

system/s3_lib.py

@@ -8,8 +8,10 @@ try:
     if 'AWS_SECRET_ACCESS_KEY' in os.environ and 'AWS_ACCESS_KEY_ID' in os.environ:
         s3_conn = boto.connect_s3()
     else:
+        print "S3 tests disabled: AWS creds not found in the environment"
         s3_conn = None
-except ImportError:
+except ImportError, e:
+    print "S3 tests disabled: can't import boto", e
     s3_conn = None
 
 

system/swift_lib.py

@@ -23,8 +23,10 @@ try:
         swift_conn = swiftclient.Connection(auth_url, auth_username,
                                             auth_password, auth_version=1)
     else:
+        print "Swift tests disabled: OpenStack creds not found in the environment"
         swift_conn = None
-except ImportError:
+except ImportError, e:
+    print "Swift tests disabled: unable to import swiftclient", e
     swift_conn = None