Merge pull request #20 from davidovich/allow-limited-storage-availability-for-tests

Only test storages that are configured in the env

Author: jdolitsky

acceptance_tests/helm.robot

@@ -2,6 +2,7 @@
 Documentation     Tests to verify that ChartMuseum is able to work with
 ...               Helm CLI and act as a valid Helm Chart Repository using
 ...               all supported storage backends (local, s3, gcs).
+Library           String
 Library           OperatingSystem
 Library           lib/ChartMuseum.py
 Library           lib/Helm.py
@@ -21,6 +22,12 @@ ChartMuseum works with Helm using Google cloud storage
 *** Keyword ***
 Test Helm integration
     [Arguments]    ${storage}
+
+    # return fast if we cannot find a bucket in an environment variable.
+    ${USTORAGE}=  Convert To Uppercase  ${storage}
+    ${ENV_STORAGE_SET}=  Get Environment variable  TEST_STORAGE_${USTORAGE}_BUCKET  ${EMPTY}
+    Return from Keyword if  '${ENV_STORAGE_SET}'=='${EMPTY}' and '${storage}'!='local'
+
     Start ChartMuseum server with storage backend  ${storage}
     Able to add ChartMuseum as Helm chart repo
     Helm search does not return test charts

acceptance_tests/lib/common.py

@@ -12,9 +12,9 @@
 KEYRING = 'testdata/pgp/helm-test-key.pub'
 LOGFILE = '.chartmuseum.log'
 
-STORAGE_AMAZON_BUCKET = os.environ['TEST_STORAGE_AMAZON_BUCKET']
-STORAGE_AMAZON_REGION = os.environ['TEST_STORAGE_AMAZON_REGION']
-STORAGE_GOOGLE_BUCKET = os.environ['TEST_STORAGE_GOOGLE_BUCKET']
+STORAGE_AMAZON_BUCKET = os.getenv('TEST_STORAGE_AMAZON_BUCKET')
+STORAGE_AMAZON_REGION = os.getenv('TEST_STORAGE_AMAZON_REGION')
+STORAGE_GOOGLE_BUCKET = os.getenv('TEST_STORAGE_GOOGLE_BUCKET')
 
 STORAGE_AMAZON_PREFIX = 'acceptance/%s' % NOW
 STORAGE_GOOGLE_PREFIX = 'acceptance/%s' % NOW

pkg/storage/amazon_test.go

@@ -52,7 +52,9 @@ func (suite *AmazonTestSuite) TestPutObject() {
 }
 
 func TestAmazonStorageTestSuite(t *testing.T) {
-	if os.Getenv("TEST_CLOUD_STORAGE") == "1" {
+	if os.Getenv("TEST_CLOUD_STORAGE") == "1" &&
+		os.Getenv("TEST_STORAGE_AMAZON_BUCKET") != "" &&
+		os.Getenv("TEST_STORAGE_AMAZON_REGION") != "" {
 		suite.Run(t, new(AmazonTestSuite))
 	}
 }

pkg/storage/storage_test.go

@@ -30,8 +30,12 @@ func (suite *StorageTestSuite) setupStorageBackends() {
 		s3Bucket := os.Getenv("TEST_STORAGE_AMAZON_BUCKET")
 		s3Region := os.Getenv("TEST_STORAGE_AMAZON_REGION")
 		gcsBucket := os.Getenv("TEST_STORAGE_GOOGLE_BUCKET")
-		suite.StorageBackends["AmazonS3"] = Backend(NewAmazonS3Backend(s3Bucket, prefix, s3Region, ""))
-		suite.StorageBackends["GoogleCS"] = Backend(NewGoogleCSBackend(gcsBucket, prefix))
+		if s3Bucket != "" && s3Region != "" {
+			suite.StorageBackends["AmazonS3"] = Backend(NewAmazonS3Backend(s3Bucket, prefix, s3Region, ""))
+		}
+		if gcsBucket != "" {
+			suite.StorageBackends["GoogleCS"] = Backend(NewGoogleCSBackend(gcsBucket, prefix))
+		}
 	}
 }
 

scripts/setup_test_environment.sh

@@ -23,14 +23,15 @@ main() {
 
 check_storage_env_vars() {
     set +x
-    ALL_ENV_VARS_PRESENT="1"
+    SOME_ENV_VARS_PRESENT="0"
     for VAR in ${REQUIRED_TEST_STORAGE_ENV_VARS[@]}; do
-           if [ "${!VAR}" == "" ]; then
-            echo "missing required test env var: $VAR"
-            ALL_ENV_VARS_PRESENT="0"
+        if [ "${!VAR}" != "" ]; then
+            echo "Detected one required test env var: $VAR"
+            SOME_ENV_VARS_PRESENT="1"
         fi
     done
-    if [ "$ALL_ENV_VARS_PRESENT" == "0" ]; then
+    if [ "$SOME_ENV_VARS_PRESENT" == "0" ]; then
+        echo "At least one or all of ${REQUIRED_TEST_STORAGE_ENV_VARS[@]} should be present"
         exit 1
     fi
     set -x