Run sweeper unconditionally on acc test runs and add CI Makefile targ…

…et (#266)

* Add exponential backoff on retryable errors. Always run the sweeper

* Ensure vif vm test waits for IP to wait for network drivers to load

* Fix linting issues

* Ensure GetConfigFromEnv sets the retry mode and max time parameters

* Remove accidental change

Makefile

@@ -36,5 +36,7 @@ test: testclient testacc
 testclient:
 	cd client; go test $(TEST) -v -count 1
 
-testacc: sweep
-	TF_ACC=1 $(TF_LOG) go test $(TEST) -parallel $(GOMAXPROCS) -v -count 1 -timeout $(TIMEOUT)
+testacc:
+	TF_ACC=1 $(TF_LOG) go test $(TEST) -parallel $(GOMAXPROCS) -v -count 1 -timeout $(TIMEOUT) -sweep=true
+ci:
+	TF_ACC=1 gotestsum --debug --rerun-fails=5 --max-fails=15 --packages=./xoa  -- ./xoa -v -count=1 -timeout=$(TIMEOUT) -sweep=true -parallel=$(GOMAXPROCS)

xoa/acc_setup_test.go

@@ -31,11 +31,12 @@ func TestMain(m *testing.M) {
 	flagSweep := flag.Lookup("sweep")
 
 	if flagSweep != nil && flagSweep.Value.String() != "" {
-		resource.TestMain(m)
-	} else {
 		_, runSetup := os.LookupEnv("TF_ACC")
 
 		if runSetup {
+			fmt.Println("Running sweeping")
+			resource.TestMain(m)
+
 			client.FindPoolForTests(&accTestPool)
 			client.FindPIFForTests(&accTestPIF)
 			client.FindTemplateForTests(&testTemplate, accTestPool.Id, "XOA_TEMPLATE")
@@ -46,19 +47,17 @@ func TestMain(m *testing.M) {
 			client.FindIsoStorageRepositoryForTests(accTestPool, &accIsoSr, accTestPrefix, "XOA_ISO_SR")
 			client.CreateUser(&accUser)
 			testIsoName = os.Getenv("XOA_ISO")
-		}
-
-		code := m.Run()
+			fmt.Printf("Found the following pool: %v sr: %v\n", accTestPool, accDefaultSr)
 
-		if runSetup {
+			code := m.Run()
 			client.RemoveNetworksWithNamePrefix(accTestPrefix)("")
 			client.RemoveVDIsWithPrefix(accTestPrefix)("")
 			client.RemoveResourceSetsWithNamePrefix(accTestPrefix)("")
 			client.RemoveTagFromAllObjects(accTestPrefix)("")
 			client.RemoveUsersWithPrefix(accTestPrefix)("")
 			client.RemoveCloudConfigsWithPrefix(accTestPrefix)("")
+			os.Exit(code)
 		}
-
-		os.Exit(code)
 	}
+
 }

xoa/resource_xenorchestra_vm_test.go

@@ -1130,7 +1130,7 @@ func TestAccXenorchestraVm_addVifAndRemoveVif(t *testing.T) {
 		CheckDestroy: testAccCheckXenorchestraVmDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccVmConfig(vmName),
+				Config: testAccVmConfigWithWaitForIp(vmName, "true"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccVmExists(resourceName),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -1694,6 +1694,10 @@ resource "xenorchestra_vm" "bar" {
 }
 
 func testAccVmConfig(vmName string) string {
+	return testAccVmConfigWithWaitForIp(vmName, "false")
+}
+
+func testAccVmConfigWithWaitForIp(vmName, waitForIp string) string {
 	return testAccCloudConfigConfig(fmt.Sprintf("vm-template-%s", vmName), "template") + testAccTemplateConfig() + fmt.Sprintf(`
 data "xenorchestra_network" "network" {
     name_label = "%s"
@@ -1716,8 +1720,9 @@ resource "xenorchestra_vm" "bar" {
       name_label = "disk 1"
       size = 10001317888
     }
+    wait_for_ip = %s
 }
-`, accDefaultNetwork.NameLabel, accTestPool.Id, vmName, accDefaultSr.Id)
+`, accDefaultNetwork.NameLabel, accTestPool.Id, vmName, accDefaultSr.Id, waitForIp)
 }
 
 // This sets destroy_cloud_config_vdi_after_boot and wait_for_ip. The former is required for