remove time.sleep from test code

Author: shivaji-kharse

dgraph/cmd/dgraphimport/import_test.go

@@ -103,7 +103,7 @@ func TestImportApis(t *testing.T) {
 		negativeTestCase bool // True if this is an expected failure case
 		description      string
 		err              string
-		sleep            bool
+		waitForSnapshot  bool
 	}{
 		{
 			name:             "SingleGroupShutTwoAlphasPerGroup",
@@ -154,7 +154,7 @@ func TestImportApis(t *testing.T) {
 			negativeTestCase: false,
 			description:      "Single group with multiple alphas, shutdown 1 alpha",
 			err:              "",
-			sleep:            true,
+			waitForSnapshot:  true,
 		},
 		{
 			name:             "TwoGroupShutOneAlphaPerGroup",
@@ -165,7 +165,7 @@ func TestImportApis(t *testing.T) {
 			negativeTestCase: false,
 			description:      "Multiple groups with multiple alphas, shutdown 2 alphas per group",
 			err:              "",
-			sleep:            true,
+			waitForSnapshot:  true,
 		},
 		{
 			name:             "ThreeGroupShutOneAlphaPerGroup",
@@ -176,7 +176,7 @@ func TestImportApis(t *testing.T) {
 			negativeTestCase: false,
 			description:      "Three groups with 3 alphas each, shutdown 1 alpha per group",
 			err:              "",
-			sleep:            true,
+			waitForSnapshot:  true,
 		},
 		{
 			name:             "SingleGroupAllAlphasOnline",
@@ -218,18 +218,18 @@ func TestImportApis(t *testing.T) {
 				t.Logf("Running test case: %s", tt.description)
 			}
 			runImportTest(t, tt.bulkAlphas, tt.targetAlphas, tt.replicasFactor, tt.downAlphas, tt.negativeTestCase,
-				tt.err, tt.sleep)
+				tt.err, tt.waitForSnapshot)
 		})
 	}
 }
 
 func runImportTest(t *testing.T, bulkAlphas, targetAlphas, replicasFactor, numDownAlphas int, negative bool,
-	errStr string, sleep bool) {
+	errStr string, waitForSnapshot bool) {
 	bulkCluster, baseDir := setupBulkCluster(t, bulkAlphas)
 	defer func() { bulkCluster.Cleanup(t.Failed()) }()
 
 	targetCluster, gc, gcCleanup := setupTargetCluster(t, targetAlphas, replicasFactor)
-	defer func() { targetCluster.Cleanup(t.Failed()) }()
+	// defer func() { targetCluster.Cleanup(t.Failed()) }()
 	defer gcCleanup()
 
 	_, err := gc.Query("schema{}")
@@ -310,8 +310,20 @@ func runImportTest(t *testing.T, bulkAlphas, targetAlphas, replicasFactor, numDo
 
 	require.NoError(t, targetCluster.HealthCheck(false))
 
-	if sleep {
-		time.Sleep(1 * time.Minute)
+	if waitForSnapshot {
+		grp := 1
+		for _, alphas := range alphaGroups {
+			for i := 0; i < numDownAlphas; i++ {
+				hc, err := targetCluster.GetAlphaHttpClient(alphas[i])
+				require.NoError(t, err)
+
+				prevTs, err := hc.GetCurrentSnapshotTs(uint64(grp))
+				require.NoError(t, err)
+				_, err = hc.WaitForSnapshot(uint64(grp), prevTs)
+				require.NoError(t, err)
+			}
+			grp++
+		}
 	}
 
 	t.Log("Import completed")
@@ -368,24 +380,49 @@ func setupTargetCluster(t *testing.T, numAlphas, replicasFactor int) (*dgraphtes
 	return cluster, gc, cleanup
 }
 
-// verifyImportResults validates the result of an import operation
+// verifyImportResults validates the result of an import operation with retry logic
 func verifyImportResults(t *testing.T, gc *dgraphapi.GrpcClient) {
-	// Check schema after streaming process
-	schemaResp, err := gc.Query("schema{}")
-	require.NoError(t, err)
-	// Compare the schema response with the expected schema
-	var actualSchema, expectedSchemaObj map[string]interface{}
-	require.NoError(t, json.Unmarshal(schemaResp.Json, &actualSchema))
-	require.NoError(t, json.Unmarshal([]byte(expectedSchema), &expectedSchemaObj))
+	maxRetries := 10
+	retryDelay := 500 * time.Millisecond
+	hasAllPredicates := true
 
-	// Check if the actual schema contains all the predicates from expected schema
-	actualPredicates := getPredicateMap(actualSchema)
+	// Get expected predicates first
+	var expectedSchemaObj map[string]interface{}
+	require.NoError(t, json.Unmarshal([]byte(expectedSchema), &expectedSchemaObj))
 	expectedPredicates := getPredicateMap(expectedSchemaObj)
 
-	for predName, predDetails := range expectedPredicates {
-		actualPred, exists := actualPredicates[predName]
-		require.True(t, exists, "Predicate '%s' not found in actual schema", predName)
-		require.Equal(t, predDetails, actualPred, "Predicate '%s' details don't match", predName)
+	for i := 0; i < maxRetries; i++ {
+		schemaResp, err := gc.Query("schema{}")
+		require.NoError(t, err)
+
+		// Parse schema response
+		var actualSchema map[string]interface{}
+		require.NoError(t, json.Unmarshal(schemaResp.Json, &actualSchema))
+
+		// Get actual predicates
+		actualPredicates := getPredicateMap(actualSchema)
+
+		// Check if all expected predicates are present
+		for predName := range expectedPredicates {
+			if _, exists := actualPredicates[predName]; !exists {
+				hasAllPredicates = false
+				break
+			}
+		}
+
+		if hasAllPredicates {
+			break
+		}
+
+		if i < maxRetries-1 {
+			t.Logf("Not all predicates found yet, retrying in %v", retryDelay)
+			time.Sleep(retryDelay)
+			retryDelay *= 2
+		}
+	}
+
+	if !hasAllPredicates {
+		t.Fatalf("Not all predicates found in schema")
 	}
 
 	for _, tt := range common.OneMillionTCs {

dgraphtest/local_cluster.go

@@ -837,6 +837,15 @@ func (c *LocalCluster) HTTPClient() (*dgraphapi.HTTPClient, error) {
 	return dgraphapi.GetHttpClient(alphaUrl, zeroUrl)
 }
 
+func (c *LocalCluster) GetAlphaHttpClient(alphaID int) (*dgraphapi.HTTPClient, error) {
+	pubPort, err := publicPort(c.dcli, c.alphas[alphaID], alphaHttpPort)
+	if err != nil {
+		return nil, err
+	}
+	url := "0.0.0.0:" + pubPort
+	return dgraphapi.GetHttpClient(url, "")
+}
+
 // serverURL returns url to the 'server' 'endpoint'
 func (c *LocalCluster) serverURL(server, endpoint string) (string, error) {
 	pubPort, err := publicPort(c.dcli, c.alphas[0], alphaHttpPort)