Hacks to try to understand hanging test

Azure · Jan 14, 2021 · 38e6a54 · 38e6a54
1 parent 8c68932
commit 38e6a54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ generate-test-certs:
 .PHONY: test-integration-controllers
 test-integration-controllers: generate fmt vet manifests
 	TEST_RESOURCE_PREFIX=$(TEST_RESOURCE_PREFIX) TEST_USE_EXISTING_CLUSTER=false REQUEUE_AFTER=20 \
-	go test -v -tags "$(BUILD_TAGS)" -coverprofile=reports/integration-controllers-coverage-output.txt -coverpkg=./... -covermode count -parallel 4 -timeout 45m \
+	go test -v -tags "$(BUILD_TAGS)" -coverprofile=reports/integration-controllers-coverage-output.txt -coverpkg=./... -covermode count -parallel 4 -timeout 45m -run "TestMySQLUserControllerNoResourceGroup" \
 	./controllers/... 
 	#2>&1 | tee reports/integration-controllers-output.txt
 	#go-junit-report < reports/integration-controllers-output.txt > reports/integration-controllers-report.xml

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -74,7 +74,9 @@ import (
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 	"github.com/Azure/azure-service-operator/api/v1alpha2"
 	"github.com/Azure/azure-service-operator/api/v1beta1"
+
 	// +kubebuilder:scaffold:imports
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -85,6 +87,7 @@ var testEnv *envtest.Environment
 var tc TestContext
 
 func setup() error {
+	ctrl.SetLogger(zap.Logger(true))
 	log.Println(fmt.Sprintf("Starting common controller test setup"))
 
 	// Go ahead and assume that we're deployed in the default namespace for
@@ -95,6 +98,7 @@ func setup() error {
 	if err != nil {
 		return err
 	}
+	log.Println(resourcemanagerconfig.ConfigString())
 
 	resourceGroupName := GenerateTestResourceName("rg-prime")
 	resourcegroupLocation := resourcemanagerconfig.DefaultLocation()

diff --git a/pkg/resourcemanager/config/config.go b/pkg/resourcemanager/config/config.go
@@ -117,12 +117,14 @@ func BaseURI() string {
 func ConfigString() string {
 	creds := GlobalCredentials()
 	return fmt.Sprintf(
-		"clientID: %q, tenantID: %q, subscriptionID: %q, cloudName: %q, useDeviceFlow: %v, useManagedIdentity: %v, podNamespace: %q",
+		"clientID: %q, tenantID: %q, subscriptionID: %q, cloudName: %q, useDeviceFlow: %v, useManagedIdentity: %v, podNamespace: %q, operatorKeyvault: %q",
 		creds.ClientID(),
 		creds.TenantID(),
 		creds.SubscriptionID(),
 		cloudName,
 		UseDeviceFlow(),
 		creds.UseManagedIdentity(),
-		podNamespace)
+		podNamespace,
+		creds.OperatorKeyvault(),
+	)
 }