tests(upgrade): add upgrade tests in query package

Author: mangalaman93

dgraphtest/cluster.go

@@ -21,8 +21,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
+	"testing"
 	"time"
 
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pkg/errors"
 
 	"github.com/dgraph-io/dgo/v210"
@@ -43,6 +46,7 @@ type Cluster interface {
 	AdminPost(body []byte) ([]byte, error)
 	AlphasHealth() ([]string, error)
 	AssignUids(num uint64) error
+	GetVersion() string
 }
 
 func SetupSchema(c Cluster, dbSchema string) error {
@@ -239,3 +243,52 @@ loop:
 		return nil
 	}
 }
+
+func ShouldSkipTest(t *testing.T, minVersion, clusterVersion string) error {
+	if clusterVersion == localVersion {
+		return nil
+	}
+
+	isParentCommit, err := isParent(minVersion, clusterVersion)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if isParentCommit {
+		t.Skipf("test is valid for commits greater than [%v]", minVersion)
+	}
+
+	return nil
+}
+
+// isParent checks whether ancestor is the ancestor commit of the given descendant commit.
+func isParent(ancestor, descendant string) (bool, error) {
+	repo, err := git.PlainOpen(repoDir)
+	if err != nil {
+		return false, errors.Wrap(err, "error opening git repo")
+	}
+
+	ancestorHash, err := repo.ResolveRevision(plumbing.Revision(ancestor))
+	if err != nil {
+		return false, errors.Wrapf(err, "error while getting reference of [%v]", ancestor)
+	}
+	ancestorCommit, err := repo.CommitObject(*ancestorHash)
+	if err != nil {
+		return false, errors.Wrapf(err, "error finding commit object [%v]", ancestor)
+	}
+
+	descendantHash, err := repo.ResolveRevision(plumbing.Revision(descendant))
+	if err != nil {
+		return false, err
+	}
+	descendantCommit, err := repo.CommitObject(*descendantHash)
+	if err != nil {
+		return false, errors.Wrapf(err, "error finding commit object [%v]", descendant)
+	}
+
+	isParentCommit, err := descendantCommit.IsAncestor(ancestorCommit)
+	if err != nil {
+		return false, errors.Wrapf(err, "unable to compare commit [%v] to commit [%v]",
+			descendant, ancestor)
+	}
+	return isParentCommit, nil
+}

dgraphtest/compose_cluster.go

@@ -42,3 +42,7 @@ func (c *ComposeCluster) AlphasHealth() ([]string, error) {
 func (c *ComposeCluster) AssignUids(num uint64) error {
 	return testutil.AssignUids(num)
 }
+
+func (c *ComposeCluster) GetVersion() string {
+	return localVersion
+}

dgraphtest/config.go

@@ -22,6 +22,10 @@ import (
 	"time"
 )
 
+const (
+	localVersion = "local"
+)
+
 type ClusterConfig struct {
 	prefix     string
 	numAlphas  int
@@ -44,7 +48,7 @@ func NewClusterConfig() ClusterConfig {
 		numZeros:  1,
 		replicas:  1,
 		verbosity: 2,
-		version:   "local",
+		version:   localVersion,
 		volumes:   map[string]string{DefaultBackupDir: defaultBackupVol},
 	}
 }

dgraphtest/dcloud_cluster.go

@@ -164,3 +164,7 @@ func (c *DCloudCluster) AssignUids(num uint64) error {
 
 	return nil
 }
+
+func (c *DCloudCluster) GetVersion() string {
+	return localVersion
+}

dgraphtest/dgraph.go

@@ -281,7 +281,7 @@ func publicPort(dcli *docker.Client, dc dnode, privatePort string) (string, erro
 }
 
 func mountBinary(c *LocalCluster) (mount.Mount, error) {
-	if c.conf.version == "local" {
+	if c.conf.version == localVersion {
 		return mount.Mount{
 			Type:     mount.TypeBind,
 			Source:   filepath.Join(os.Getenv("GOPATH"), "bin"),

dgraphtest/image.go

@@ -63,7 +63,7 @@ func (c *LocalCluster) setupBinary() error {
 
 	hash, err := repo.ResolveRevision(plumbing.Revision(c.conf.version))
 	if err != nil {
-		return err
+		return errors.Wrap(err, "error while getting refrence hash")
 	}
 	if err := checkoutGitRepo(repo, hash); err != nil {
 		return err
@@ -80,7 +80,7 @@ func checkoutGitRepo(repo *git.Repository, hash *plumbing.Hash) error {
 	if err != nil {
 		return errors.Wrap(err, "error while getting git repo work tree")
 	}
-	if err = worktree.Checkout(&git.CheckoutOptions{Hash: plumbing.NewHash(hash.String())}); err != nil {
+	if err := worktree.Checkout(&git.CheckoutOptions{Hash: *hash}); err != nil {
 		return errors.Wrap(err, fmt.Sprintf("error while checking out git repo with hash [%v]", hash.String()))
 	}
 	return nil

dgraphtest/local_cluster.go

@@ -42,7 +42,7 @@ import (
 )
 
 var (
-	requestTimeout = 60 * time.Second
+	requestTimeout = 90 * time.Second
 	stopTimeout    = time.Minute
 )
 
@@ -672,3 +672,7 @@ func (c *LocalCluster) AssignUids(num uint64) error {
 	}
 	return nil
 }
+
+func (c *LocalCluster) GetVersion() string {
+	return c.conf.version
+}

query/cloud_test.go

@@ -19,18 +19,20 @@
 package query
 
 import (
-	"os"
 	"testing"
 
 	"github.com/dgraph-io/dgraph/dgraphtest"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 func TestMain(m *testing.M) {
 	c, err := dgraphtest.NewDCloudCluster()
 	x.Panic(err)
 	defer c.Cleanup()
 
-	client = c.Client()
+	client, err = c.Client()
+	x.Panic(err)
+
 	dc = c
 	populateCluster()
 	m.Run()

query/common_test.go

@@ -1,4 +1,4 @@
-//go:build integration || cloud
+//go:build integration || cloud || upgrade
 
 /*
  * Copyright 2017-2023 Dgraph Labs, Inc. and Contributors
@@ -352,7 +352,7 @@ func populateCluster() {
 		panic(err)
 	}
 
-	if err := dc.AssignUids(21000); err != nil {
+	if err := dc.AssignUids(65536); err != nil {
 		panic(err)
 	}
 	setSchema(testSchema)

query/mutation_test.go

@@ -1,4 +1,4 @@
-//go:build integration || cloud
+//go:build integration || cloud || upgrade
 
 /*
  * Copyright 2016-2023 Dgraph Labs, Inc. and Contributors