summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-10-05 17:08:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-06 11:41:48 +0100
commit4454d024485d671ded558e3c617900f6fad414a4 (patch)
treef5575f585052bd61c3affc5a16228fc2f394ec15 /bitbake/lib
parent7f67977518d69dc84cbbcc4cf1ea859c51e57d18 (diff)
downloadpoky-4454d024485d671ded558e3c617900f6fad414a4.tar.gz
bitbake: toaster: Update tests to reflect front end changes
- Browser test we changed the project heading access to use the class name - Update toastergui unit test for additional gotoUrl property - On faster browsers we had a race for layer details inputs being visible (Bitbake rev: 80f377ebcffd01dbe393ccffb999df4b04552f8a) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: bavery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/tests/browser/test_layerdetails_page.py4
-rw-r--r--bitbake/lib/toaster/tests/browser/test_project_page.py2
-rw-r--r--bitbake/lib/toaster/toastergui/tests.py8
3 files changed, 12 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py b/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
index 72b6f60c21..6392d1efb6 100644
--- a/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
+++ b/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
@@ -91,6 +91,10 @@ class TestLayerDetailsPage(SeleniumTestCase):
91 for btn in self.find_all("dd .glyphicon-edit"): 91 for btn in self.find_all("dd .glyphicon-edit"):
92 btn.click() 92 btn.click()
93 93
94 # Wait for the inputs to become visible
95 self.wait_until_visible("#layer-git input[type=text]")
96 self.wait_until_visible("dd textarea")
97
94 # Edit each value 98 # Edit each value
95 for inputs in self.find_all("#layer-git input[type=text]") + \ 99 for inputs in self.find_all("#layer-git input[type=text]") + \
96 self.find_all("dd textarea"): 100 self.find_all("dd textarea"):
diff --git a/bitbake/lib/toaster/tests/browser/test_project_page.py b/bitbake/lib/toaster/tests/browser/test_project_page.py
index 786bef1c6e..0186463324 100644
--- a/bitbake/lib/toaster/tests/browser/test_project_page.py
+++ b/bitbake/lib/toaster/tests/browser/test_project_page.py
@@ -55,5 +55,5 @@ class TestProjectPage(SeleniumTestCase):
55 self.get(url) 55 self.get(url)
56 56
57 # check that we get a project page with the correct heading 57 # check that we get a project page with the correct heading
58 project_name = self.find('#project-name').text.strip() 58 project_name = self.find('.project-name').text.strip()
59 self.assertEqual(project_name, self.CLI_BUILDS_PROJECT_NAME) 59 self.assertEqual(project_name, self.CLI_BUILDS_PROJECT_NAME)
diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py
index 050861159a..2b5894f743 100644
--- a/bitbake/lib/toaster/toastergui/tests.py
+++ b/bitbake/lib/toaster/toastergui/tests.py
@@ -248,7 +248,13 @@ class ViewTests(TestCase):
248 url = reverse('xhr_customrecipe_id', args=(recipe.id,)) 248 url = reverse('xhr_customrecipe_id', args=(recipe.id,))
249 response = self.client.delete(url) 249 response = self.client.delete(url)
250 self.assertEqual(response.status_code, 200) 250 self.assertEqual(response.status_code, 200)
251 self.assertEqual(json.loads(response.content.decode('utf-8')), {"error": "ok"}) 251
252 gotoUrl = reverse('projectcustomimages', args=(self.project.pk,))
253
254 self.assertEqual(json.loads(response.content.decode('utf-8')),
255 {"error": "ok",
256 "gotoUrl": gotoUrl})
257
252 # try to delete not-existent recipe 258 # try to delete not-existent recipe
253 url = reverse('xhr_customrecipe_id', args=(recipe.id,)) 259 url = reverse('xhr_customrecipe_id', args=(recipe.id,))
254 response = self.client.delete(url) 260 response = self.client.delete(url)