Merge pull request #363 from terraform-providers/f-disk-vmdk-naming-d…

…ecouple r/virtual_machine: New disk device naming and tracking behaviour
hashicorp · Jan 23, 2018 · ba30c39 · ba30c39
2 parents a5a9544 + 95e7ebe
commit ba30c39
Show file tree

Hide file tree

Showing 9 changed files with 1,256 additions and 757 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -14,7 +14,10 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 240m
+
+debugacc: fmtcheck
+	TF_ACC=1 dlv test $(TEST) -- -test.v $(TESTARGS)
 
 vet:
 	@echo "go vet ."