Update integration tests to run as upgrade tests for multitenancy #8799

jbhamra1 · 2023-04-20T02:19:11Z

we now start using dgraphtest package instead of testutil package. This PR also modifies the tests in systest/multi-tenancy package to run as both integration as well as upgrade tests.

The below test functions in systest/multi-tenancy/basic_test.go file are modified to run for 'upgrade' and 'integration' test using dgraphtest framework. For 'integration', Upgrade() is a NOOP.

func (suite *MultitenancyTestSuite) TestAclBasic() {
func (suite *MultitenancyTestSuite) TestNameSpaceLimitFlag() {
func (suite *MultitenancyTestSuite) TestPersistentQuery() {
func (suite *MultitenancyTestSuite) TestTokenExpired() {
func (suite *MultitenancyTestSuite) TestTwoPermissionSetsInNameSpacesWithAcl() {
func (suite *MultitenancyTestSuite) TestCreateNamespace() {
func (suite *MultitenancyTestSuite) TestResetPassword() {
func (suite *MultitenancyTestSuite) TestDeleteNamespace() {

systest/multi-tenancy/integration_test.go and systest/multi-tenancy/upgrade_test.go contains the testify/suite functions and datatypes to start the test.

integration_basic_helper_test.go contain test functions that are run for integration test.

systest/multi-tenancy/upgrade_basic_test.go

mangalaman93

still reviewing

dgraphtest/cluster.go

systest/multi-tenancy/upgrade_basic_test.go

dgraphtest/cluster.go

systest/multi-tenancy/upgrade_basic_test.go

dgraphtest/cluster.go

systest/multi-tenancy/upgrade_basic_test.go

mangalaman93

The PR looks much cleaner, thanks for all the work.

dgraphtest/cluster.go

dgraphtest/config.go

dgraphtest/dgraph.go

systest/multi-tenancy/basic_test.go

systest/multi-tenancy/integration_basic_helper_test.go

systest/multi-tenancy/upgrade_basic_test.go

all-seeing-code · 2023-05-29T09:42:39Z

we now start using dgraphtest package instead of testutil package. This PR also modifies the tests in systest/multi-tenancy package to run as both integration as well as upgrade tests.

@jbhamra1 Could you please add which tests were added and if there were test cases which were modified. A small summary would help me in reviewing the code.

jbhamra1 · 2023-05-29T11:23:38Z

we now start using dgraphtest package instead of testutil package. This PR also modifies the tests in systest/multi-tenancy package to run as both integration as well as upgrade tests.

@jbhamra1 Could you please add which tests were added and if there were test cases which were modified. A small summary would help me in reviewing the code.

The below test functions in systest/multi-tenancy/basic_test.go file are modified to run for 'upgrade' and 'integration' using dgraphtest framework. For 'integration', Upgrade() is a NOOP.

func (suite *MultitenancyTestSuite) TestAclBasic() {
func (suite *MultitenancyTestSuite) TestNameSpaceLimitFlag() {
func (suite *MultitenancyTestSuite) TestPersistentQuery() {
func (suite *MultitenancyTestSuite) TestTokenExpired() {
func (suite *MultitenancyTestSuite) TestTwoPermissionSetsInNameSpacesWithAcl() {
func (suite *MultitenancyTestSuite) TestCreateNamespace() {
func (suite *MultitenancyTestSuite) TestResetPassword() {
func (suite *MultitenancyTestSuite) TestDeleteNamespace() {

integration_test.go and upgrade_test.go contains the testify/suite functions and datatypes to start the test.

integration_basic_helper_test.go contain test functions that are run for integration test.

harshil-goel

Great work, a bit of nitpicks here and there.

systest/multi-tenancy/upgrade_test.go

go.mod

dgraphtest/namespace.go

dgraphtest/json.go

dgraphtest/dgraph.go

harshil-goel · 2023-05-29T21:40:16Z

systest/multi-tenancy/basic_test.go

-				name
-			}
+	// Upgrade
+	suite.Upgrade()


I feel a bit uneasy calling upgrade here, given that this would be used for integration tests also. Can we improve this?

What doesn't feel right to you? For integration tests, this function is empty. It looks odd I agree, we couldn't think of a better way though.

joshua-goldstein

Putting this block here for now, because we need to fix the infrastructure in dgraphtest before adding more tests. @mangalaman93

) we now start using dgraphtest package instead of testutil package. This PR also modifies the tests in systest/multi-tenancy package to run as both integration as well as upgrade tests. The below test functions in systest/multi-tenancy/basic_test.go file are modified to run for 'upgrade' and 'integration' test using dgraphtest framework. For 'integration', Upgrade() is a NOOP. func (suite *MultitenancyTestSuite) TestAclBasic() { func (suite *MultitenancyTestSuite) TestNameSpaceLimitFlag() { func (suite *MultitenancyTestSuite) TestPersistentQuery() { func (suite *MultitenancyTestSuite) TestTokenExpired() { func (suite *MultitenancyTestSuite) TestTwoPermissionSetsInNameSpacesWithAcl() { func (suite *MultitenancyTestSuite) TestCreateNamespace() { func (suite *MultitenancyTestSuite) TestResetPassword() { func (suite *MultitenancyTestSuite) TestDeleteNamespace() { systest/multi-tenancy/integration_test.go and systest/multi-tenancy/upgrade_test.go contains the testify/suite functions and datatypes to start the test. integration_basic_helper_test.go contain test functions that are run for integration test.

) (#8854) we now start using dgraphtest package instead of testutil package. This PR also modifies the tests in systest/multi-tenancy package to run as both integration as well as upgrade tests. The below test functions in systest/multi-tenancy/basic_test.go file are modified to run for 'upgrade' and 'integration' test using dgraphtest framework. For 'integration', Upgrade() is a NOOP. func (suite *MultitenancyTestSuite) TestAclBasic() { func (suite *MultitenancyTestSuite) TestNameSpaceLimitFlag() { func (suite *MultitenancyTestSuite) TestPersistentQuery() { func (suite *MultitenancyTestSuite) TestTokenExpired() { func (suite *MultitenancyTestSuite) TestTwoPermissionSetsInNameSpacesWithAcl() { func (suite *MultitenancyTestSuite) TestCreateNamespace() { func (suite *MultitenancyTestSuite) TestResetPassword() { func (suite *MultitenancyTestSuite) TestDeleteNamespace() { systest/multi-tenancy/integration_test.go and systest/multi-tenancy/upgrade_test.go contains the testify/suite functions and datatypes to start the test. integration_basic_helper_test.go contain test functions that are run for integration test. Co-authored-by: Jassi <jbhamra@dgraph.io>

jbhamra1 requested review from mangalaman93 and harshil-goel April 20, 2023 02:19

ghost added area/testing Testing related issues go Pull requests that update Go code labels Apr 20, 2023

jbhamra1 commented Apr 20, 2023

View reviewed changes

systest/multi-tenancy/upgrade_basic_test.go Outdated Show resolved Hide resolved

mangalaman93 requested changes Apr 20, 2023

View reviewed changes

dgraphtest/cluster.go Outdated Show resolved Hide resolved

systest/multi-tenancy/upgrade_basic_test.go Outdated Show resolved Hide resolved

systest/multi-tenancy/upgrade_basic_test.go Outdated Show resolved Hide resolved

jbhamra1 commented Apr 24, 2023

View reviewed changes

systest/multi-tenancy/upgrade_basic_test.go Outdated Show resolved Hide resolved

mangalaman93 requested changes May 4, 2023

View reviewed changes

jbhamra1 force-pushed the jassi/upgrade-multi-tenancy branch from df25dc7 to a19f192 Compare May 11, 2023 14:57

mangalaman93 requested changes May 11, 2023

View reviewed changes

jbhamra1 force-pushed the jassi/upgrade-multi-tenancy branch from a19f192 to 2776ed8 Compare May 17, 2023 07:09

mangalaman93 requested changes May 17, 2023

View reviewed changes

jbhamra1 force-pushed the jassi/upgrade-multi-tenancy branch from 2776ed8 to 59d1575 Compare May 18, 2023 15:00

mangalaman93 changed the title ~~Multitenancy test, draft 1~~ Upgrade testing for multitenancy May 22, 2023

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from 59d1575 to b0600b6 Compare May 22, 2023 23:50

mangalaman93 changed the title ~~Upgrade testing for multitenancy~~ Update integration tests to run as upgrade tests for multitenancy May 23, 2023

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from b0600b6 to 172828e Compare May 23, 2023 07:04

mangalaman93 marked this pull request as ready for review May 23, 2023 07:04

mangalaman93 requested review from akon-dey, skrdgraph, darkn3rd, meghalims, matthewmcneely and billprovince as code owners May 23, 2023 07:04

jbhamra1 force-pushed the jassi/upgrade-multi-tenancy branch from 172828e to badbf40 Compare May 25, 2023 10:20

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch 2 times, most recently from ce9c16e to b6ee096 Compare May 26, 2023 04:58

mangalaman93 previously approved these changes May 26, 2023

View reviewed changes

mangalaman93 dismissed their stale review via f13e02d May 26, 2023 05:02

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from b6ee096 to f13e02d Compare May 26, 2023 05:02

harshil-goel reviewed May 29, 2023

View reviewed changes

mangalaman93 previously approved these changes May 31, 2023

View reviewed changes

joshua-goldstein suggested changes May 31, 2023

View reviewed changes

mangalaman93 dismissed their stale review via f248367 June 3, 2023 15:23

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from d3ee584 to f248367 Compare June 3, 2023 15:23

mangalaman93 previously approved these changes Jun 3, 2023

View reviewed changes

mangalaman93 dismissed their stale review via 57f7233 June 3, 2023 15:28

mangalaman93 previously approved these changes Jun 3, 2023

View reviewed changes

mangalaman93 dismissed their stale review via 2b0a742 June 3, 2023 18:53

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from 57f7233 to 2b0a742 Compare June 3, 2023 18:53

mangalaman93 previously approved these changes Jun 3, 2023

View reviewed changes

add upgrade test for multitenancy package

9af1765

mangalaman93 dismissed their stale review via 9af1765 June 4, 2023 03:36

mangalaman93 force-pushed the jassi/upgrade-multi-tenancy branch from 2b0a742 to 9af1765 Compare June 4, 2023 03:36

mangalaman93 approved these changes Jun 5, 2023

View reviewed changes

mangalaman93 changed the base branch from main to aman/upgrade-testing June 5, 2023 17:28

mangalaman93 merged commit 8ff718a into aman/upgrade-testing Jun 5, 2023

mangalaman93 deleted the jassi/upgrade-multi-tenancy branch June 5, 2023 17:28

Update integration tests to run as upgrade tests for multitenancy #8799

Update integration tests to run as upgrade tests for multitenancy #8799

Uh oh!

Conversation

jbhamra1 commented Apr 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mangalaman93 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mangalaman93 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

all-seeing-code commented May 29, 2023

Uh oh!

jbhamra1 commented May 29, 2023

Uh oh!

harshil-goel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

harshil-goel May 29, 2023

Choose a reason for hiding this comment

Uh oh!

mangalaman93 May 29, 2023

Choose a reason for hiding this comment

Uh oh!

joshua-goldstein left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jbhamra1 commented Apr 20, 2023 •

edited

Loading