Skip to content

Commit

Permalink
Merge pull request #486 from Shopify/assertion_fix
Browse files Browse the repository at this point in the history
Don't fail if pod took 10s
  • Loading branch information
KnVerey committed May 22, 2019
2 parents 297010d + e40f484 commit 29b7096
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/integration/kubernetes_deploy_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_service_account_predeployed_before_unmanaged_pod
hello_cloud.assert_unmanaged_pod_statuses("Succeeded", 1)
assert_logs_match_all([
%r{Successfully deployed in \d.\ds: ServiceAccount/build-robot},
%r{Successfully deployed in \d.\ds: Pod/unmanaged-pod-.*},
%r{Successfully deployed in \d+.\ds: Pod/unmanaged-pod-.*},
], in_order: true)
end

Expand All @@ -80,7 +80,7 @@ def test_role_and_role_binding_predeployed_before_unmanaged_pod
assert_logs_match_all([
%r{Successfully deployed in \d.\ds: Role/role},
%r{Successfully deployed in \d.\ds: RoleBinding/role-binding},
%r{Successfully deployed in \d.\ds: Pod/unmanaged-pod-1-.*},
%r{Successfully deployed in \d+.\ds: Pod/unmanaged-pod-1-.*},
], in_order: true)
end

Expand Down

0 comments on commit 29b7096

Please sign in to comment.