status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use backport-compatible assertion (#15546) 

* Use backport-compatible assertion

* Add workaround for broken apt-get
This commit is contained in:
Chris S. Kim 2022-11-24 11:44:20 -05:00 committed by GitHub
parent 386da5439a
commit 27c53f6c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.circleci/config.yml
View File

@ -491,7 +491,10 @@ jobs:
GOOS: linux GOOS: linux
steps: steps:
- checkout - checkout
- run: sudo apt-get update --allow-releaseinfo-change-suite --allow-releaseinfo-change-version && sudo apt-get install -y gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu - run:
command: |
sudo rm -fv /etc/apt/sources.list.d/github_git-lfs.list # workaround for https://github.com/actions/runner-images/issues/1983
sudo apt-get update --allow-releaseinfo-change-suite --allow-releaseinfo-change-version && sudo apt-get install -y gcc-arm-linux-gnueabi gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu
- run: - run:
environment: environment:
GOARM: 5 GOARM: 5

2
agent/consul/client_test.go
View File

@ -964,6 +964,6 @@ func TestClient_RPC_Timeout(t *testing.T) {
}, },
}, &out) }, &out)
require.Error(t, err) require.Error(t, err)
require.ErrorContains(t, err, "rpc error making call: i/o deadline reached") require.Contains(t, err.Error(), "rpc error making call: i/o deadline reached")
}) })
} }