Wait until devices appear

internal/provider/provider_test.go

@@ -88,11 +88,6 @@ func runTests(m *testing.M) int {
 		panic(err)
 	}
 
-	w := wait.ForHTTP("/status").WithPort(port).WithTLS(true).WithAllowInsecure(true)
-	if err = w.WaitUntilReady(ctx, container); err != nil {
-		panic(err)
-	}
-
 	testClient = &unifi.Client{}
 	setHTTPClient(testClient, true, "unifi")
 	testClient.SetBaseURL(endpoint)

internal/provider/resource_device_test.go

@@ -23,25 +23,36 @@ func allocateDevice(t *testing.T) (string, func()) {
 	ctx := context.Background()
 
 	deviceInit.Do(func() {
-		devices, err := testClient.ListDevice(ctx, "default")
-		if err != nil {
-			t.Fatalf("Error listing devices: %s", err)
-		}
-
-		for _, device := range devices {
-			if device.Type != "usw" {
-				continue
+		// The demo devices don't appear instantly when the controller starts.
+		err := resource.RetryContext(ctx, 1*time.Minute, func() *resource.RetryError {
+			devices, err := testClient.ListDevice(ctx, "default")
+			if err != nil {
+				return resource.NonRetryableError(fmt.Errorf("Error listing devices: %w", err))
 			}
 
-			// These devices aren't really switches.
-			if device.Model == "USPRPS" || device.Model == "USPRPSP" || device.Model == "USPPDUHD" || device.Model == "USPPDUP" {
-				continue
+			if len(devices) == 0 {
+				return resource.RetryableError(fmt.Errorf("No devices found"))
 			}
 
-			d := device
-			if ok := devicePool.Add(&d); !ok {
-				t.Fatal("Failed to add device to pool")
+			for _, device := range devices {
+				if device.Type != "usw" {
+					continue
+				}
+
+				// These devices aren't really switches.
+				if device.Model == "USPRPS" || device.Model == "USPRPSP" || device.Model == "USPPDUHD" || device.Model == "USPPDUP" {
+					continue
+				}
+
+				d := device
+				if ok := devicePool.Add(&d); !ok {
+					return resource.NonRetryableError("Failed to add device to pool")
+				}
 			}
+		})
+
+		if err != nil {
+			t.Fatal(err)
 		}
 	})