Merge pull request #338 from andyzhangx/expand-vol-test

test: add expand volume integration test

Author: andyzhangx

pkg/blob/azure_test.go

@@ -33,7 +33,6 @@ import (
 // TestGetCloudProvider tests the func getCloudProvider().
 // To run this unit test successfully, need to ensure /etc/kubernetes/azure.json nonexistent.
 func TestGetCloudProvider(t *testing.T) {
-
 	fakeCredFile := "fake-cred-file.json"
 	fakeKubeConfig := "fake-kube-config"
 	emptyKubeConfig := "empty-kube-config"
@@ -145,10 +144,13 @@ users:
 			}
 			os.Setenv(DefaultAzureCredentialFileEnv, fakeCredFile)
 		}
-		_, err := getCloudProvider(test.kubeconfig, test.nodeID)
+		cloud, err := getCloudProvider(test.kubeconfig, test.nodeID)
 		if !reflect.DeepEqual(err, test.expectedErr) {
 			t.Errorf("desc: %s,\n input: %q, GetCloudProvider err: %v, expectedErr: %v", test.desc, test.kubeconfig, err, test.expectedErr)
 		}
+		if cloud == nil {
+			t.Errorf("return value of getCloudProvider should not be nil even there is error")
+		}
 	}
 }
 

test/integration/run-test.sh

@@ -66,6 +66,9 @@ if [[ "$cloud" != "AzureChinaCloud" ]]; then
   csc node stats --endpoint "$endpoint" "$volumeid:$target_path:$staging_target_path"
   sleep 2
 
+  echo 'expand volume test'
+  csc controller expand-volume --endpoint "$endpoint" --req-bytes "$expanded_vol_size" "$volumeid"
+
   echo "unpublish volume test:"
   csc node unpublish --endpoint "$endpoint" --target-path "$target_path" "$volumeid"
   sleep 2
@@ -75,11 +78,6 @@ if [[ "$cloud" != "AzureChinaCloud" ]]; then
   sleep 2
 fi
 
-# TODO: Activate test once issue is resolved - https://github.com/rexray/gocsi/issues/141
-# echo "Expand volume test:"
-# csc controller expand-volume --endpoint "$endpoint" --req-bytes "$expanded_vol_size" "$volumeid"
-# sleep 15
-
 echo "Delete volume test:"
 csc controller del --endpoint "$endpoint" "$volumeid"
 sleep 15