Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Remove race condition in sync e2e test #2885

Merged
merged 1 commit into from
Mar 1, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions test/e2e/12_sync.bats
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@ function setup() {
poll_until_true 'workload podinfo' 'kubectl -n demo describe deployment/podinfo'

# Check the sync tag
git pull -f --tags
local sync_tag_hash
sync_tag_hash=$(git rev-list -n 1 flux)
local head_hash
head_hash=$(git rev-list -n 1 HEAD)
[ "$head_hash" = "$sync_tag_hash" ]
poll_until_equals "sync tag" "$head_hash" 'git pull -f --tags > /dev/null 2>&1; git rev-list -n 1 flux'

podinfo_image=$(kubectl get pod -n demo -l app=podinfo -o"jsonpath={['items'][0]['spec']['containers'][0]['image']}")

# Bump the image of podinfo, duplicate the resource definition (to cause a sync failure)
Expand Down