diff options
Diffstat (limited to 'bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py')
-rw-r--r-- | bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py b/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py index 7844aaa395..d7a4c34532 100644 --- a/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py +++ b/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py | |||
@@ -6,7 +6,6 @@ | |||
6 | # | 6 | # |
7 | # Copyright (C) 2013-2016 Intel Corporation | 7 | # Copyright (C) 2013-2016 Intel Corporation |
8 | # | 8 | # |
9 | |||
10 | from django.urls import reverse | 9 | from django.urls import reverse |
11 | from django.utils import timezone | 10 | from django.utils import timezone |
12 | from tests.browser.selenium_helpers import SeleniumTestCase | 11 | from tests.browser.selenium_helpers import SeleniumTestCase |
@@ -14,6 +13,8 @@ from tests.browser.selenium_helpers_base import Wait | |||
14 | from orm.models import Project, Build, Task, Recipe, Layer, Layer_Version | 13 | from orm.models import Project, Build, Task, Recipe, Layer, Layer_Version |
15 | from bldcontrol.models import BuildRequest | 14 | from bldcontrol.models import BuildRequest |
16 | 15 | ||
16 | from selenium.webdriver.common.by import By | ||
17 | |||
17 | class TestMostRecentBuildsStates(SeleniumTestCase): | 18 | class TestMostRecentBuildsStates(SeleniumTestCase): |
18 | """ Test states update correctly in most recent builds area """ | 19 | """ Test states update correctly in most recent builds area """ |
19 | 20 | ||
@@ -45,13 +46,14 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
45 | # build queued; check shown as queued | 46 | # build queued; check shown as queued |
46 | selector = base_selector + '[data-build-state="Queued"]' | 47 | selector = base_selector + '[data-build-state="Queued"]' |
47 | element = self.wait_until_visible(selector) | 48 | element = self.wait_until_visible(selector) |
48 | self.assertRegexpMatches(element.get_attribute('innerHTML'), | 49 | self.assertRegex(element.get_attribute('innerHTML'), |
49 | 'Build queued', 'build should show queued status') | 50 | 'Build queued', 'build should show queued status') |
50 | 51 | ||
51 | # waiting for recipes to be parsed | 52 | # waiting for recipes to be parsed |
52 | build.outcome = Build.IN_PROGRESS | 53 | build.outcome = Build.IN_PROGRESS |
53 | build.recipes_to_parse = recipes_to_parse | 54 | build.recipes_to_parse = recipes_to_parse |
54 | build.recipes_parsed = 0 | 55 | build.recipes_parsed = 0 |
56 | build.save() | ||
55 | 57 | ||
56 | build_request.state = BuildRequest.REQ_INPROGRESS | 58 | build_request.state = BuildRequest.REQ_INPROGRESS |
57 | build_request.save() | 59 | build_request.save() |
@@ -62,7 +64,7 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
62 | element = self.wait_until_visible(selector) | 64 | element = self.wait_until_visible(selector) |
63 | 65 | ||
64 | bar_selector = '#recipes-parsed-percentage-bar-%s' % build.id | 66 | bar_selector = '#recipes-parsed-percentage-bar-%s' % build.id |
65 | bar_element = element.find_element_by_css_selector(bar_selector) | 67 | bar_element = element.find_element(By.CSS_SELECTOR, bar_selector) |
66 | self.assertEqual(bar_element.value_of_css_property('width'), '0px', | 68 | self.assertEqual(bar_element.value_of_css_property('width'), '0px', |
67 | 'recipe parse progress should be at 0') | 69 | 'recipe parse progress should be at 0') |
68 | 70 | ||
@@ -73,7 +75,7 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
73 | self.get(url) | 75 | self.get(url) |
74 | 76 | ||
75 | element = self.wait_until_visible(selector) | 77 | element = self.wait_until_visible(selector) |
76 | bar_element = element.find_element_by_css_selector(bar_selector) | 78 | bar_element = element.find_element(By.CSS_SELECTOR, bar_selector) |
77 | recipe_bar_updated = lambda driver: \ | 79 | recipe_bar_updated = lambda driver: \ |
78 | bar_element.get_attribute('style') == 'width: 50%;' | 80 | bar_element.get_attribute('style') == 'width: 50%;' |
79 | msg = 'recipe parse progress bar should update to 50%' | 81 | msg = 'recipe parse progress bar should update to 50%' |
@@ -94,11 +96,11 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
94 | 96 | ||
95 | selector = base_selector + '[data-build-state="Starting"]' | 97 | selector = base_selector + '[data-build-state="Starting"]' |
96 | element = self.wait_until_visible(selector) | 98 | element = self.wait_until_visible(selector) |
97 | self.assertRegexpMatches(element.get_attribute('innerHTML'), | 99 | self.assertRegex(element.get_attribute('innerHTML'), |
98 | 'Tasks starting', 'build should show "tasks starting" status') | 100 | 'Tasks starting', 'build should show "tasks starting" status') |
99 | 101 | ||
100 | # first task finished; check tasks progress bar | 102 | # first task finished; check tasks progress bar |
101 | task1.order = 1 | 103 | task1.outcome = Task.OUTCOME_SUCCESS |
102 | task1.save() | 104 | task1.save() |
103 | 105 | ||
104 | self.get(url) | 106 | self.get(url) |
@@ -107,7 +109,7 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
107 | element = self.wait_until_visible(selector) | 109 | element = self.wait_until_visible(selector) |
108 | 110 | ||
109 | bar_selector = '#build-pc-done-bar-%s' % build.id | 111 | bar_selector = '#build-pc-done-bar-%s' % build.id |
110 | bar_element = element.find_element_by_css_selector(bar_selector) | 112 | bar_element = element.find_element(By.CSS_SELECTOR, bar_selector) |
111 | 113 | ||
112 | task_bar_updated = lambda driver: \ | 114 | task_bar_updated = lambda driver: \ |
113 | bar_element.get_attribute('style') == 'width: 50%;' | 115 | bar_element.get_attribute('style') == 'width: 50%;' |
@@ -115,13 +117,13 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
115 | element = Wait(self.driver).until(task_bar_updated, msg) | 117 | element = Wait(self.driver).until(task_bar_updated, msg) |
116 | 118 | ||
117 | # last task finished; check tasks progress bar updates | 119 | # last task finished; check tasks progress bar updates |
118 | task2.order = 2 | 120 | task2.outcome = Task.OUTCOME_SUCCESS |
119 | task2.save() | 121 | task2.save() |
120 | 122 | ||
121 | self.get(url) | 123 | self.get(url) |
122 | 124 | ||
123 | element = self.wait_until_visible(selector) | 125 | element = self.wait_until_visible(selector) |
124 | bar_element = element.find_element_by_css_selector(bar_selector) | 126 | bar_element = element.find_element(By.CSS_SELECTOR, bar_selector) |
125 | task_bar_updated = lambda driver: \ | 127 | task_bar_updated = lambda driver: \ |
126 | bar_element.get_attribute('style') == 'width: 100%;' | 128 | bar_element.get_attribute('style') == 'width: 100%;' |
127 | msg = 'tasks progress bar should update to 100%' | 129 | msg = 'tasks progress bar should update to 100%' |
@@ -183,7 +185,7 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
183 | selector = '[data-latest-build-result="%s"] ' \ | 185 | selector = '[data-latest-build-result="%s"] ' \ |
184 | '[data-build-state="Cancelling"]' % build.id | 186 | '[data-build-state="Cancelling"]' % build.id |
185 | element = self.wait_until_visible(selector) | 187 | element = self.wait_until_visible(selector) |
186 | self.assertRegexpMatches(element.get_attribute('innerHTML'), | 188 | self.assertRegex(element.get_attribute('innerHTML'), |
187 | 'Cancelling the build', 'build should show "cancelling" status') | 189 | 'Cancelling the build', 'build should show "cancelling" status') |
188 | 190 | ||
189 | # check cancelled state | 191 | # check cancelled state |
@@ -195,5 +197,5 @@ class TestMostRecentBuildsStates(SeleniumTestCase): | |||
195 | selector = '[data-latest-build-result="%s"] ' \ | 197 | selector = '[data-latest-build-result="%s"] ' \ |
196 | '[data-build-state="Cancelled"]' % build.id | 198 | '[data-build-state="Cancelled"]' % build.id |
197 | element = self.wait_until_visible(selector) | 199 | element = self.wait_until_visible(selector) |
198 | self.assertRegexpMatches(element.get_attribute('innerHTML'), | 200 | self.assertRegex(element.get_attribute('innerHTML'), |
199 | 'Build cancelled', 'build should show "cancelled" status') | 201 | 'Build cancelled', 'build should show "cancelled" status') |