From ab9e13c4e0cea02e8931a78b4c05cf4b7c5b249c Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Thu, 24 Nov 2022 11:44:52 -0500 Subject: [PATCH] Backport of Use backport-compatible assertion into release/1.14.x (#15549) This pull request was automerged via backport-assistant --- .circleci/config.yml | 5 ++++- agent/consul/client_test.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4339461661..a6c178e157 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -491,7 +491,10 @@ jobs: GOOS: linux steps: - 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: environment: GOARM: 5 diff --git a/agent/consul/client_test.go b/agent/consul/client_test.go index 1944c5bc81..cef20c291b 100644 --- a/agent/consul/client_test.go +++ b/agent/consul/client_test.go @@ -964,6 +964,6 @@ func TestClient_RPC_Timeout(t *testing.T) { }, }, &out) 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") }) }