From 6b1ba45d081104d8f0addef81595f4dbec3d14ec Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Dec 01 2016 05:19:26 +0000
Subject: [beaker-tests-backend] also update build id in the test script and action-tasks.json and let app.py confirm build start before killing


---

diff --git a/beaker-tests/Regression/backend/tests/cancel_build/action-tasks.json b/beaker-tests/Regression/backend/tests/cancel_build/action-tasks.json
index dbe11ee..c534339 100644
--- a/beaker-tests/Regression/backend/tests/cancel_build/action-tasks.json
+++ b/beaker-tests/Regression/backend/tests/cancel_build/action-tasks.json
@@ -6,6 +6,6 @@
   "action_type": 10,
   "created_on": 1462513764,
   "id": 42,
-  "data": "{\"task_id\": \"10-fedora-24-x86_64\"}"
+  "data": "{\"task_id\": \"42-fedora-24-x86_64\"}"
 }
 ]
diff --git a/beaker-tests/Regression/backend/tests/cancel_build/run.sh b/beaker-tests/Regression/backend/tests/cancel_build/run.sh
index e727fcb..ea7eea1 100755
--- a/beaker-tests/Regression/backend/tests/cancel_build/run.sh
+++ b/beaker-tests/Regression/backend/tests/cancel_build/run.sh
@@ -20,11 +20,12 @@ rlJournalStart
             sleep 1
         done
 
+        sleep 10 # sleep additional 10 seconds to confirm build start
         kill -9 `pgrep -f app.py` # kill app.py so that it does not wait for build end
         sleep 60 # sleep additional 60 seconds for the build to get running
 
         # test that the build is running
-        rlRun "docker exec copr-backend copr_get_vm_info.py | grep -E 'task_id: 10-fedora-24-x86_64'"
+        rlRun "docker exec copr-backend copr_get_vm_info.py | grep -E 'task_id: 42-fedora-24-x86_64'"
 
         # action input crunching
         rlRun "/usr/share/copr/mocks/frontend/app.py $TESTPATH $TESTPATH/static" 0
@@ -38,6 +39,6 @@ rlJournalStart
             (\$b | sort_by(.id) | map({id: .id, status: .result}))'" 0 "Compare expected and actual action outcomes (success/fail)."
 
         # test that the task has been killed and vm released for another job
-        rlRun "docker exec copr-backend copr_get_vm_info.py | grep -E 'task_id: 10-fedora-24-x86_64'" 1
+        rlRun "docker exec copr-backend copr_get_vm_info.py | grep -E 'task_id: 42-fedora-24-x86_64'" 1
     rlPhaseEnd
 rlJournalEnd &> /dev/null