소스 검색

Merge pull request #307 from docker/aci_e2e_group

Random ACI group name for tests, otherwise we are conflicting with each other + the CI
Guillaume Tardif 5 년 전
부모
커밋
a48c4fb41c
1개의 변경된 파일17개의 추가작업 그리고 10개의 파일을 삭제
  1. 17 10
      tests/aci-e2e/e2e-aci_test.go

+ 17 - 10
tests/aci-e2e/e2e-aci_test.go

@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"net/url"
 	"os"
 	"strings"
@@ -41,15 +42,18 @@ import (
 )
 
 const (
-	resourceGroupName = "resourceGroupTest"
 	location          = "westeurope"
 	contextName       = "acitest"
-
 	testContainerName = "testcontainername"
+	testShareName     = "dockertestshare"
+	testFileContent   = "Volume mounted with success!"
+	testFileName      = "index.html"
 )
 
 var (
-	subscriptionID string
+	subscriptionID         string
+	resourceGroupName      = "resourceGroupTestE2E-" + RandStringBytes(10)
+	testStorageAccountName = "storageteste2e" + RandStringBytes(6) // "between 3 and 24 characters in length and use numbers and lower-case letters only"
 )
 
 type E2eACISuite struct {
@@ -258,13 +262,6 @@ func (s *E2eACISuite) TestACIBackend() {
 	})
 }
 
-const (
-	testStorageAccountName = "dockertestaccount"
-	testShareName          = "dockertestshare"
-	testFileContent        = "Volume mounted with success!"
-	testFileName           = "index.html"
-)
-
 func createStorageAccount(aciContext store.AciContext, accountName string) azure_storage.Account {
 	log.Println("Creating storage account " + accountName)
 	storageAccount, err := storage.CreateStorageAccount(context.TODO(), aciContext, accountName)
@@ -334,3 +331,13 @@ func deleteResourceGroup(groupName string) {
 	err = helper.Delete(ctx, *models[0].SubscriptionID, groupName)
 	Expect(err).To(BeNil())
 }
+
+func RandStringBytes(n int) string {
+	rand.Seed(time.Now().UnixNano())
+	const digits = "0123456789"
+	b := make([]byte, n)
+	for i := range b {
+		b[i] = digits[rand.Intn(len(digits))]
+	}
+	return string(b)
+}