github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport of Use backport-compatible assertion into release/1.14.x (#15549) 

This pull request was automerged via backport-assistant
pull/15552/head
hc-github-team-consul-core 2022-11-24 11:44:52 -05:00 committed by GitHub
parent 8dcbee57e6
commit ab9e13c4e0
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")
}) })
} }