fixing test cases for cluster setup

hypermodeinc · Oct 13, 2020 · bca0bb5 · bca0bb5
1 parent 06df1c5
commit bca0bb5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/tlstest/mtls_internal/ha_6_node/docker-compose.yml b/tlstest/mtls_internal/ha_6_node/docker-compose.yml
@@ -19,7 +19,7 @@ services:
         target: /dgraph-tls
         read_only: true
     command: /gobin/dgraph alpha -o 100 --my=alpha1:7180 --zero=zero1:5180
-      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alph1auser
+      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alpha1user
       --whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
   alpha2:
     image: dgraph/dgraph:latest
@@ -81,7 +81,7 @@ services:
         source: ../tls/zero1
         target: /dgraph-tls
         read_only: true
-    command: /gobin/dgraph zero -o 100 --idx=1 --my=zero1:5180 --logtostderr --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero1 --dgraph_tls_client_name zero1user
+    command: /gobin/dgraph zero -o 100 --idx=1 --replicas 3 --my=zero1:5180 --logtostderr --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero1 --dgraph_tls_client_name zero1user
       -v=2 --bindall
   zero2:
     image: dgraph/dgraph:latest
@@ -101,7 +101,7 @@ services:
         source: ../tls/zero2
         target: /dgraph-tls
         read_only: true
-    command: /gobin/dgraph zero -o 200 --idx=2 --my=zero2:5280 --logtostderr --peer zero1:5180 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero2 --dgraph_tls_client_name zero2user
+    command: /gobin/dgraph zero -o 200 --idx=2 --replicas 3 --my=zero2:5280 --logtostderr --peer zero1:5180 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero2 --dgraph_tls_client_name zero2user
       -v=2 --bindall
   zero3:
     image: dgraph/dgraph:latest
@@ -121,6 +121,6 @@ services:
         source: ../tls/zero3
         target: /dgraph-tls
         read_only: true
-    command: /gobin/dgraph zero -o 300 --idx=3 --my=zero3:5380 --logtostderr --peer zero1:5180 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero3 --dgraph_tls_client_name zero3user
+    command: /gobin/dgraph zero -o 300 --idx=3 --replicas 3 --my=zero3:5380 --logtostderr --peer zero1:5180 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero3 --dgraph_tls_client_name zero3user
       -v=2 --bindall
 volumes: {}
diff --git a/tlstest/mtls_internal/ha_6_node/mtls_internal_ha_test.go b/tlstest/mtls_internal/ha_6_node/mtls_internal_ha_test.go
@@ -76,7 +76,7 @@ func runTests(t *testing.T, client *dgo.Dgraph) {
 }
 
 func TestHAClusterSetup(t *testing.T) {
-	dgConn, err := grpc.Dial(":7180", grpc.WithInsecure())
+	dgConn, err := grpc.Dial(":9180", grpc.WithInsecure())
 	if err != nil {
 		t.Fatalf("%+v", err)
 	}

diff --git a/tlstest/mtls_internal/multi_group/docker-compose.yml b/tlstest/mtls_internal/multi_group/docker-compose.yml
@@ -19,7 +19,7 @@ services:
         target: /dgraph-tls
         read_only: true
     command: /gobin/dgraph alpha -o 100 --my=alpha1:7180 --zero=zero1:5180
-      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alph1auser
+      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alpha1user
       --whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
   alpha2:
     image: dgraph/dgraph:latest

diff --git a/tlstest/mtls_internal/multi_group/mtls_internal_multi_group_test.go b/tlstest/mtls_internal/multi_group/mtls_internal_multi_group_test.go
@@ -76,7 +76,7 @@ func runTests(t *testing.T, client *dgo.Dgraph) {
 }
 
 func TestClusterSetupWithMultiGroup(t *testing.T) {
-	dgConn, err := grpc.Dial(":7180", grpc.WithInsecure())
+	dgConn, err := grpc.Dial(":9180", grpc.WithInsecure())
 	if err != nil {
 		t.Fatalf("%+v", err)
 	}

diff --git a/tlstest/mtls_internal/single_node/docker-compose.yml b/tlstest/mtls_internal/single_node/docker-compose.yml
@@ -15,11 +15,11 @@ services:
         target: /gobin
         read_only: true
       - type: bind
-        source: ../tls/alpha
+        source: ../tls/alpha1
         target: /dgraph-tls
         read_only: true
     command: /gobin/dgraph alpha -o 100 --my=alpha1:7180 --zero=zero1:5180
-      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alph1auser
+      --logtostderr -v=2 --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name alpha1 --dgraph_tls_client_name alpha1user
       --whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
   zero1:
     image: dgraph/dgraph:latest
@@ -36,7 +36,7 @@ services:
         target: /gobin
         read_only: true
       - type: bind
-        source: ../tls/zero
+        source: ../tls/zero1
         target: /dgraph-tls
         read_only: true
     command: /gobin/dgraph zero -o 100 --idx=1 --my=zero1:5180 --logtostderr --dgraph_tls_dir /dgraph-tls --dgraph_tls_server_name zero1 --dgraph_tls_client_name zero1user

diff --git a/tlstest/mtls_internal/single_node/mtls_internal_test.go b/tlstest/mtls_internal/single_node/mtls_internal_test.go
@@ -76,7 +76,7 @@ func runTests(t *testing.T, client *dgo.Dgraph) {
 }
 
 func TestClusterSetup(t *testing.T) {
-	dgConn, err := grpc.Dial(":7180", grpc.WithInsecure())
+	dgConn, err := grpc.Dial(":9180", grpc.WithInsecure())
 	if err != nil {
 		t.Fatalf("%+v", err)
 	}