resolve review comments

Author: Shiva

dgraph/cmd/dgraphimport/import_test.go

@@ -63,8 +63,6 @@ const expectedSchema = `{
 }`
 
 func TestDrainModeAfterStartSnapshotStream(t *testing.T) {
-	// t.Skip("Skipping... sometimes the query for schema succeeds even when the server is in draining mode")
-
 	tests := []struct {
 		name        string
 		numAlphas   int
@@ -111,8 +109,6 @@ func TestDrainModeAfterStartSnapshotStream(t *testing.T) {
 }
 
 func TestImportApis(t *testing.T) {
-	// t.Skip("Skipping import tests due to persistent flakiness with container networking and Raft leadership issues")
-
 	tests := []testcase{
 		{
 			name:           "SingleGroupShutTwoAlphasPerGroup",
@@ -379,12 +375,12 @@ func verifyImportResults(t *testing.T, gc *dgraphapi.GrpcClient, downAlphas int)
 	}
 
 	retryDelay := time.Second
-	hasAllPredicates := true
 
 	// Get expected predicates first
 	var expectedSchemaObj map[string]interface{}
 	require.NoError(t, json.Unmarshal([]byte(expectedSchema), &expectedSchemaObj))
 	expectedPredicates := getPredicateMap(expectedSchemaObj)
+	var hasAllPredicates bool
 
 	for i := 0; i < maxRetries; i++ {
 		// Checking client connection again here because an import operation may be in progress on the rejoined alpha
@@ -400,8 +396,7 @@ func verifyImportResults(t *testing.T, gc *dgraphapi.GrpcClient, downAlphas int)
 		// Get actual predicates
 		actualPredicates := getPredicateMap(actualSchema)
 
-		hasAllPredicates := true
-		// Check if all expected predicates are present
+		hasAllPredicates = true
 		for predName := range expectedPredicates {
 			if _, exists := actualPredicates[predName]; !exists {
 				hasAllPredicates = false