Merge pull request #940 from Sifchain/testing/fix-macbook-integration…

…-tests

Fix integration tests for macbook

.github/workflows/go.yml

@@ -46,4 +46,5 @@ jobs:
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./coverage.txt
-        flags: server
+        flags: server
+        verbose: true

.github/workflows/node.yml

@@ -66,4 +66,5 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: ./ui/core/coverage
-          flags: ui
+          flags: ui
+          verbose: true

codecov.yml

@@ -10,18 +10,27 @@ coverage:
 
   status:
     # Learn more at https://docs.codecov.io/docs/commit-status
+    default_rules:
+      flag_coverage_not_uploaded_behavior: exclude # don't send status checks that don't have flag coverage uploaded
+    patch: off
     project:
-      default: false
+      default:
+        flags:
+          - server
+          - ui
       server:
         target: 50%
-        flags: server
+        flags:
+          - server
         paths:
           - "x/"
           - "!x/**/client/" # ignore client package
       ui:
         target: 70%
-        flags: ui
-        paths: "ui/core/src"
+        flags:
+          - ui
+        paths:
+          - "ui/core/src"
     changes: false
 
 comment:
@@ -34,9 +43,11 @@ flags:
     paths:
       - "x/"
       - "!x/**/client/" # ignore client package
+    carryforward: true
   ui:
     paths:
       - "ui/core/src"
+    carryforward: true
 
 ignore:
   - "docs"

test/integration/sifchain_start_ebrelayer.sh

@@ -15,4 +15,8 @@ set_persistant_env_var EBRELAYER_LOG $datadir/logs/ebrelayer.$(filenamedate).log
 nohup $TEST_INTEGRATION_DIR/sifchain_run_ebrelayer.sh < /dev/null > $EBRELAYER_LOG 2>&1 &
 set_persistant_env_var EBRELAYER_PID $! $envexportfile
 
-( tail -n +1 -F $EBRELAYER_LOG & ) | grep -m 1 "Started Ethereum websocket with provider"
+# This doesn't work either (from python), although it worked from bash on Macbook.  Commenting it out for now as we really don't need it.
+# fail and add timeout to the check.
+#timeout 30s grep -m 1 'Started Ethereum websocket with provider' <(tail -n +1 -f $EBRELAYER_LOG) || exit 1
+# This doesn't work on macbook for some reason
+#( tail -n +1 -F $EBRELAYER_LOG & ) | grep -m 1 "Started Ethereum websocket with provider"