tests(upgrade): add upgrade tests in query package

query/cloud_test.go

@@ -19,21 +19,21 @@
 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()
-	if err != nil {
-		panic(err)
-	}
+	x.Panic(err)
 	defer c.Cleanup()
 
-	client = c.Client()
+	client, err = c.Client()
+	x.Panic(err)
+
 	dc = c
 	populateCluster()
-	os.Exit(m.Run())
+	_ = 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/integration_test.go

@@ -19,7 +19,6 @@
 package query
 
 import (
-	"os"
 	"testing"
 
 	"github.com/dgraph-io/dgraph/dgraphtest"
@@ -32,8 +31,8 @@ func TestMain(m *testing.M) {
 
 	var err error
 	client, err = testutil.DgraphClientWithGroot(testutil.SockAddr)
-	x.CheckfNoTrace(err)
+	x.Check(err)
 
 	populateCluster()
-	os.Exit(m.Run())
+	_ = m.Run()
 }

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

query/query0_test.go

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

query/query1_test.go

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

query/query2_test.go

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

query/query3_test.go

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

query/query4_test.go

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

query/query_facets_test.go

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

query/rdf_result_test.go

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

query/upgrade_test.go

@@ -0,0 +1,62 @@
+//go:build upgrade
+
+/*
+ * Copyright 2023 Dgraph Labs, Inc. and Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package query
+
+import (
+	"testing"
+	"time"
+
+	"github.com/dgraph-io/dgraph/dgraphtest"
+	"github.com/dgraph-io/dgraph/x"
+)
+
+func TestMain(m *testing.M) {
+	conf := dgraphtest.NewClusterConfig().WithNumAlphas(3).WithNumZeros(3).WithReplicas(3).
+		WithACL(20 * time.Second).WithEncryption().WithVersion("8b3712e")
+	c, err := dgraphtest.NewLocalCluster(conf)
+	x.Panic(err)
+	defer c.Cleanup()
+	c.Start()
+
+	// setup the global Cluster var
+	dc = c
+
+	// setup client
+	dg, err := c.Client()
+	if err != nil {
+		panic(err)
+	}
+	client = dg
+
+	// do mutations
+	populateCluster()
+
+	// upgrade
+	x.Panic(c.Upgrade("68427a7", dgraphtest.BackupRestore))
+
+	// setup the client again
+	dg, err = c.Client()
+	if err != nil {
+		panic(err)
+	}
+	client = dg
+
+	// Run tests
+	_ = m.Run()
+}