Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(tests): Remove ACL and multi-tenancy tests #7

Merged
merged 1 commit into from
Feb 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 0 additions & 153 deletions graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go

This file was deleted.

40 changes: 0 additions & 40 deletions graphql/e2e/admin_auth/poorman_auth_with_acl/docker-compose.yml

This file was deleted.

20 changes: 1 addition & 19 deletions graphql/e2e/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -523,34 +523,16 @@ func SafelyUpdateGQLSchemaOnAlpha1(t *testing.T, schema string) *GqlSchema {
return SafelyUpdateGQLSchema(t, Alpha1HTTP, schema, nil)
}

// SafelyDropAllWithGroot can be used in tests for doing DROP_ALL when ACL is enabled.
// This should be used after at least one schema update operation has succeeded.
// Once the control returns from it, one can be sure that the DROP_ALL has reached
// the GraphQL layer and the existing schema has been updated to an empty schema.
func SafelyDropAllWithGroot(t *testing.T) {
safelyDropAll(t, true)
}

// SafelyDropAll can be used in tests for doing DROP_ALL when ACL is disabled.
// This should be used after at least one schema update operation has succeeded.
// Once the control returns from it, one can be sure that the DROP_ALL has reached
// the GraphQL layer and the existing schema has been updated to an empty schema.
func SafelyDropAll(t *testing.T) {
safelyDropAll(t, false)
}

func safelyDropAll(t *testing.T, withGroot bool) {
// first, make an initial probe to get the schema update counter
oldCounter := RetryProbeGraphQL(t, Alpha1HTTP, nil).SchemaUpdateCounter

// do DROP_ALL
var dg *dgo.Dgraph
var err error
if withGroot {
dg, err = testutil.DgraphClientWithGroot(Alpha1gRPC)
} else {
dg, err = testutil.DgraphClient(Alpha1gRPC)
}
dg, err := testutil.DgraphClient(Alpha1gRPC)
require.NoError(t, err)
testutil.DropAll(t, dg)

Expand Down
87 changes: 0 additions & 87 deletions graphql/e2e/multi_tenancy/docker-compose.yml

This file was deleted.

Loading