Skip to content

Commit 5ca6527

Browse files
committed
Update tesst-05 and test-06 to use 'expectQuery' insted of 'expectInvoke'
Signed-off-by: Osama Rabea <osrab3@gmail.com>
1 parent 5ee1742 commit 5ca6527

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

e2e-network/docker/test-05-v3.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ expectInvoke() {
4141
(cd "$TEST_TMP" && sh ../expect-invoke-cli.sh "$1" "$2" "$3" "$4" "$5" "")
4242
}
4343

44+
expectQuery() {
45+
(cd "$TEST_TMP" && sh ../expect-query-cli.sh "$1" "$2" "$3" "$4" "$5")
46+
}
47+
4448
expectCommand() {
4549
sh "$TEST_TMP/../expect-command.sh" "$1" "$2"
4650
}
@@ -65,20 +69,20 @@ waitForContainer "peer1.org1.example.com" "Membership view has changed. peers we
6569
expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
6670
'{"Args":["KVContract:put", "name", "Willy Wonka"]}' \
6771
'{\"success\":\"OK\"}'
68-
expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
72+
expectQuery "peer1.org1.example.com" "my-channel1" "chaincode1" \
6973
'{"Args":["KVContract:get", "name"]}' \
70-
'{\"success\":\"Willy Wonka\"}'
74+
'{"success":"Willy Wonka"}'
7175

7276
# Verify channel query scripts
7377
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch newest my-channel1 org1 peer1)
74-
expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:get"
78+
expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:put"
7579

7680
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch 3 my-channel1 org1 peer1 "another.block")
7781
expectCommand "cat \"$TEST_TMP/another.block\"" "KVContract:put"
7882

7983
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch config my-channel1 org1 peer1 "channel-config.json")
8084
expectCommand "cat \"$TEST_TMP/channel-config.json\"" "\"mod_policy\": \"Admins\","
8185

82-
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":5"
86+
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":4"
8387

8488
echo "🎉 Test passed! 🎉"

e2e-network/docker/test-06-v3-bft.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ expectInvoke() {
4141
(cd "$TEST_TMP" && sh ../expect-invoke-cli.sh "$1" "$2" "$3" "$4" "$5" "")
4242
}
4343

44+
expectQuery() {
45+
(cd "$TEST_TMP" && sh ../expect-query-cli.sh "$1" "$2" "$3" "$4" "$5")
46+
}
47+
4448
expectCommand() {
4549
sh "$TEST_TMP/../expect-command.sh" "$1" "$2"
4650
}
@@ -68,20 +72,20 @@ waitForContainer "peer1.org1.example.com" "Membership view has changed. peers we
6872
expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
6973
'{"Args":["KVContract:put", "name", "Willy Wonka"]}' \
7074
'{\"success\":\"OK\"}'
71-
expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
75+
expectQuery "peer1.org1.example.com" "my-channel1" "chaincode1" \
7276
'{"Args":["KVContract:get", "name"]}' \
73-
'{\"success\":\"Willy Wonka\"}'
77+
'{"success":"Willy Wonka"}'
7478

7579
# Verify channel query scripts
7680
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch newest my-channel1 org1 peer1)
77-
expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:get"
81+
expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:put"
7882

7983
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch 3 my-channel1 org1 peer1 "another.block")
8084
expectCommand "cat \"$TEST_TMP/another.block\"" "KVContract:put"
8185

8286
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch config my-channel1 org1 peer1 "channel-config.json")
8387
expectCommand "cat \"$TEST_TMP/channel-config.json\"" "\"mod_policy\": \"Admins\","
8488

85-
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":5"
89+
expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":4"
8690

8791
echo "🎉 Test passed! 🎉"

e2e/__snapshots__/fabloCommands.test.ts.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ exports[`extend config should extend custom config 1`] = `
44
"Validation errors count: 0
55
Validation warnings count: 0
66
===========================================================
7-
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
87
{
98
"global": {
109
"fabricVersion": "2.4.3",
@@ -2472,7 +2471,6 @@ exports[`extend config should extend default config 1`] = `
24722471
"Validation errors count: 0
24732472
Validation warnings count: 0
24742473
===========================================================
2475-
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
24762474
{
24772475
"global": {
24782476
"fabricVersion": "2.5.12",

0 commit comments

Comments
 (0)