mirror of
https://github.com/kemko/nomad.git
synced 2026-01-01 16:05:42 +03:00
e2e: use f.NoError instead of requires
This commit is contained in:
@@ -176,7 +176,7 @@ func (tc *ConsulE2ETest) TestCanaryInplaceUpgrades(f *framework.F) {
|
||||
|
||||
return true, nil
|
||||
}, func(err error) {
|
||||
require.NoError(t, err, "error while waiting for deploys")
|
||||
f.NoError(err, "error while waiting for deploys")
|
||||
})
|
||||
|
||||
allocID := activeDeploy.TaskGroups["consul_canary_test"].PlacedCanaries[0]
|
||||
@@ -196,7 +196,7 @@ func (tc *ConsulE2ETest) TestCanaryInplaceUpgrades(f *framework.F) {
|
||||
return *alloc.DeploymentStatus.Healthy, fmt.Errorf("expected healthy canary but found: %#v",
|
||||
alloc.DeploymentStatus)
|
||||
}, func(err error) {
|
||||
require.NoError(t, err, "error waiting for canary to be healthy")
|
||||
f.NoError(err, "error waiting for canary to be healthy")
|
||||
})
|
||||
|
||||
// Check Consul for canary tags
|
||||
@@ -212,7 +212,7 @@ func (tc *ConsulE2ETest) TestCanaryInplaceUpgrades(f *framework.F) {
|
||||
}
|
||||
return false, fmt.Errorf(`could not find service tags {"canary", "foo"}: %#v`, consulServices)
|
||||
}, func(err error) {
|
||||
require.NoError(t, err, "error waiting for canary tags")
|
||||
f.NoError(err, "error waiting for canary tags")
|
||||
})
|
||||
|
||||
// Promote canary
|
||||
|
||||
Reference in New Issue
Block a user