fix more tests

Author: mangalaman93

schema/schema.go

@@ -232,6 +232,7 @@ func (s *state) IsIndexed(ctx context.Context, pred string) bool {
 	s.RLock()
 	defer s.RUnlock()
 	if isWrite {
+		// Todo(Aman): we could return the query schema if it is a delete.
 		if schema, ok := s.mutSchema[pred]; ok && len(schema.Tokenizer) > 0 {
 			return true
 		}

systest/1million/1million_test.go

@@ -21,6 +21,7 @@ package main
 import (
 	"context"
 	"io/ioutil"
+	"os"
 	"testing"
 	"time"
 
@@ -9268,7 +9269,7 @@ func Test1Million(t *testing.T) {
 		t.Fatalf("Error while getting a dgraph client: %v", err)
 	}
 
-	schemaFile := "benchmarks/data/1million.schema"
+	schemaFile := os.Getenv("SCHEMA_FILE")
 	data, err := ioutil.ReadFile(schemaFile)
 	if err != nil {
 		t.Fatalf("Error in reading the schema :: %v", err)

systest/1million/test-reindex.sh

@@ -68,6 +68,7 @@ if [[ ! -z "$TEAMCITY_VERSION" ]]; then
 fi
 
 Info "running regression queries"
+export SCHEMA_FILE
 go test -v -tags systest || FOUND_DIFFS=1
 
 Info "bringing down zero and alpha and data volumes"

testutil/client.go

@@ -366,11 +366,7 @@ type curlOutput struct {
 	Errors []curlErrorEntry       `json:"errors"`
 }
 
-func verifyOutput(t *testing.T, bytes []byte, failureConfig *CurlFailureConfig) {
-	output := curlOutput{}
-	require.NoError(t, json.Unmarshal(bytes, &output),
-		"unable to unmarshal the curl output")
-
+func verifyOutput(t *testing.T, output curlOutput, failureConfig *CurlFailureConfig) {
 	if failureConfig.ShouldFail {
 		require.True(t, len(output.Errors) > 0, "no error entry found")
 		if len(failureConfig.DgraphErrMsg) > 0 {
@@ -387,21 +383,28 @@ func verifyOutput(t *testing.T, bytes []byte, failureConfig *CurlFailureConfig)
 
 // VerifyCurlCmd executes the curl command with the given arguments and verifies
 // the result against the expected output.
-func VerifyCurlCmd(t *testing.T, args []string,
-	failureConfig *CurlFailureConfig) {
-	queryCmd := exec.Command("curl", args...)
-
-	output, err := queryCmd.Output()
-	if len(failureConfig.CurlErrMsg) > 0 {
-		// the curl command should have returned an non-zero code
-		require.Error(t, err, "the curl command should have failed")
-		if ee, ok := err.(*exec.ExitError); ok {
-			require.True(t, strings.Contains(string(ee.Stderr), failureConfig.CurlErrMsg),
-				"the curl output does not contain the expected output")
+func VerifyCurlCmd(t *testing.T, args []string, failureConfig *CurlFailureConfig) {
+	for {
+		queryCmd := exec.Command("curl", args...)
+		output, err := queryCmd.Output()
+		if len(failureConfig.CurlErrMsg) > 0 {
+			// the curl command should have returned an non-zero code
+			require.Error(t, err, "the curl command should have failed")
+			if ee, ok := err.(*exec.ExitError); ok {
+				require.True(t, strings.Contains(string(ee.Stderr), failureConfig.CurlErrMsg),
+					"the curl output does not contain the expected output")
+			}
+		} else {
+			require.NoError(t, err, "the curl command should have succeeded")
+			co := curlOutput{}
+			require.NoError(t, json.Unmarshal(output, &co),
+				"unable to unmarshal the curl output")
+			if len(co.Errors) > 0 && strings.Contains(co.Errors[0].Code, "schema is already being modified") {
+				time.Sleep(time.Second)
+				continue
+			}
+			verifyOutput(t, co, failureConfig)
 		}
-	} else {
-		require.NoError(t, err, "the curl command should have succeeded")
-		verifyOutput(t, output, failureConfig)
 	}
 }
 

tlstest/acl/acl_over_tls_test.go

@@ -5,7 +5,9 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"io/ioutil"
+	"strings"
 	"testing"
+	"time"
 
 	"github.com/dgraph-io/dgo/v2"
 	"github.com/dgraph-io/dgo/v2/protos/api"
@@ -103,8 +105,15 @@ func TestLoginOverTLS(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unable to get dgraph client: %s", err.Error())
 	}
-	if err := dg.Login(context.Background(), "groot", "password"); err != nil {
-		t.Fatalf("Unable to login using the groot account: %v", err.Error())
+	for {
+		err := dg.Login(context.Background(), "groot", "password")
+		if err == nil {
+			break
+		} else if err != nil && !strings.Contains(err.Error(), "user not found for id groot") {
+			t.Fatalf("Unable to login using the groot account: %v", err.Error())
+		}
+
+		time.Sleep(time.Second)
 	}
 
 	// Output: