add supervision test

build/docker-compose.sh

@@ -33,6 +33,12 @@ CLI5="docker exec ${NODE5} /root/chain33-cli"
 
 # shellcheck disable=SC2034
 NODE6="${1}_chain28_1"
+# shellcheck disable=SC2034
+NODE7="${1}_chain27_1"
+# shellcheck disable=SC2034
+NODE8="${1}_chain26_1"
+# shellcheck disable=SC2034
+NODE9="${1}_chain25_1"
 
 containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}")
 export COMPOSE_PROJECT_NAME="$1"

build/docker-compose.yml

@@ -24,3 +24,15 @@ services:
   chain28:
     build:
       context: .
+
+  chain27:
+    build:
+      context: .
+
+  chain26:
+    build:
+      context: .
+
+  chain25:
+    build:
+      context: .

build/system-fork-test.sh

@@ -23,8 +23,15 @@ CLI5="docker exec ${NODE5} /root/chain33-cli"
 NODE6="${1}_chain28_1"
 CLI6="docker exec ${NODE6} /root/chain33-cli"
 
-containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}" "${NODE5}" "${NODE6}")
-forkContainers=("${CLI3}" "${CLI2}" "${CLI}" "${CLI4}" "${CLI5}" "${CLI6}")
+NODE7="${1}_chain27_1"
+CLI7="docker exec ${NODE7} /root/chain33-cli"
+NODE8="${1}_chain26_1"
+CLI8="docker exec ${NODE8} /root/chain33-cli"
+NODE9="${1}_chain25_1"
+CLI9="docker exec ${NODE9} /root/chain33-cli"
+
+containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}" "${NODE5}" "${NODE6}" "${NODE7}" "${NODE8}" "${NODE9}")
+forkContainers=("${CLI3}" "${CLI2}" "${CLI}" "${CLI4}" "${CLI5}" "${CLI6}" "${CLI7}" "${CLI8}" "${CLI9}")
 
 export COMPOSE_PROJECT_NAME="$1"
 

plugin/dapp/paracross/cmd/build/docker-compose-paracross.yml

@@ -35,6 +35,21 @@ services:
     environment:
       PARAFILE: "/root/chain33.para28.toml"
 
+  chain27:
+    entrypoint: /root/entrypoint.sh
+    environment:
+      PARAFILE: "/root/chain33.para27.toml"
+
+  chain26:
+    entrypoint: /root/entrypoint.sh
+    environment:
+      PARAFILE: "/root/chain33.para26.toml"
+
+  chain25:
+    entrypoint: /root/entrypoint.sh
+    environment:
+      PARAFILE: "/root/chain33.para25.toml"
+
   nginx:
     image: nginx:latest
     depends_on:

plugin/dapp/paracross/cmd/test/test-rpc.sh

@@ -237,7 +237,6 @@ function paracross_GetSupervisionInfo() {
     chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetSupervisionNodeGroupAddrs","payload":{"title":"user.p.para."}}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("key","value"),true])' "GetSupervisionNodeGroupAddrs"
     chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"GetSupervisionNodeGroupStatus","payload":{"title":"user.p.para."}}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("status"),true])' "GetSupervisionNodeGroupStatus"
     chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"ListSupervisionNodeGroupStatus","payload":{"title":"user.p.para.","status":2}}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("status"),true])' "ListSupervisionNodeGroupStatus status:2"
-    chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"ListSupervisionNodeGroupStatus","payload":{"title":"user.p.para.","status":3}}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("status"),true])' "ListSupervisionNodeGroupStatus status:3"
     chain33_Http '{"method":"Chain33.Query","params":[{ "execer":"paracross", "funcName":"ListSupervisionNodeGroupStatus","payload":{"title":"user.p.para.","status":4}}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("status"),true])' "ListSupervisionNodeGroupStatus status:4"
 }