Fix run test 05 on linux (#601)

Author: dpereowei

.github/workflows/test-on-push.yml

@@ -172,35 +172,11 @@ jobs:
 
   test-05-v3:
     needs: test-main
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
-
-      - name: Fix Python conflicts between macOS runner and Homebrew
-        run: |
-          # see https://github.com/actions/setup-python/issues/577
-          brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
-
-      - name: Install homebrew dependencies
-        run: |
-          set -x
-          sudo chmod ugo+w /usr/local/bin
-          brew install docker docker-compose lima qemu
-
-      - name: Install and start Colima
-        run: |
-          brew install colima
-          colima version
-          colima start --cpu 3 --memory 6 --disk 100 --vm-type=qemu --mount-type=sshfs --dns=1.1.1.1
-          colima restart
-
-      - name: Install dependencies
-        run: |
-          brew install shellcheck yamllint
-          npm install -g npm@latest
-          npm install
-
+        
       - name: Build Fablo
         run: |
           shellcheck --version && \
@@ -219,7 +195,7 @@ jobs:
             e2e-network/docker/test-05-v3.sh.logs/*
             e2e-network/docker/test-05-v3.sh.tmpdir/fablo-target/**/*
 
-  test-05-v3-BFT:
+  test-06-v3-BFT:
     needs: test-main
     runs-on: ubuntu-latest
     steps:

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

@@ -109,11 +109,11 @@ expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
 expectCommand "cat \"$TEST_TMP/newest.block\"" "KVContract:get"
 
 (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch 3 my-channel1 org1 peer1 "another.block")
-expectCommand "cat \"$TEST_TMP/another.block\"" "KVContract:put"
+expectCommand "cat \"$TEST_TMP/another.block\"" "put"
 
 (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" channel fetch config my-channel1 org1 peer1 "channel-config.json")
 expectCommand "cat \"$TEST_TMP/channel-config.json\"" "\"mod_policy\": \"Admins\","
 
-expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":5"
+expectCommand "(cd \"$TEST_TMP\" && \"$FABLO_HOME/fablo.sh\" channel getinfo my-channel1 org1 peer1)" "\"height\":6"
 
 echo "🎉 Test passed! 🎉"