summaryrefslogtreecommitdiffstats
path: root/lib/toaster/tests
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-06-10 16:48:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-14 11:08:59 +0100
commit830743b1aa29a5ac220141e9c24b2592d6cebb29 (patch)
treee62ec9bb8cd83b4238890107830c7f8b851bd2b6 /lib/toaster/tests
parentd382b2afb2939ae1b69a80ad083fb4c47303f8d0 (diff)
downloadbitbake-830743b1aa29a5ac220141e9c24b2592d6cebb29.tar.gz
toaster: selenium tests Update unique custom image string and fix import
- Update the string for recognising a duplicate image recipe - Fix an incorrect relative import Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Diffstat (limited to 'lib/toaster/tests')
-rw-r--r--lib/toaster/tests/browser/test_builddashboard_page.py2
-rw-r--r--lib/toaster/tests/browser/test_new_custom_image_page.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/toaster/tests/browser/test_builddashboard_page.py b/lib/toaster/tests/browser/test_builddashboard_page.py
index 5e0874947..0d39abb05 100644
--- a/lib/toaster/tests/browser/test_builddashboard_page.py
+++ b/lib/toaster/tests/browser/test_builddashboard_page.py
@@ -22,7 +22,7 @@
from django.core.urlresolvers import reverse
from django.utils import timezone
-from selenium_helpers import SeleniumTestCase
+from tests.browser.selenium_helpers import SeleniumTestCase
from orm.models import Project, Release, BitbakeVersion, Build, LogMessage
from orm.models import Layer, Layer_Version, Recipe, CustomImageRecipe
diff --git a/lib/toaster/tests/browser/test_new_custom_image_page.py b/lib/toaster/tests/browser/test_new_custom_image_page.py
index 8906cb27d..ab5a8e66b 100644
--- a/lib/toaster/tests/browser/test_new_custom_image_page.py
+++ b/lib/toaster/tests/browser/test_new_custom_image_page.py
@@ -25,6 +25,7 @@ from tests.browser.selenium_helpers import SeleniumTestCase
from orm.models import BitbakeVersion, Release, Project, ProjectLayer, Layer
from orm.models import Layer_Version, Recipe, CustomImageRecipe
+
class TestNewCustomImagePage(SeleniumTestCase):
CUSTOM_IMAGE_NAME = 'roopa-doopa'
@@ -140,7 +141,7 @@ class TestNewCustomImagePage(SeleniumTestCase):
self._create_custom_image(self.recipe.name)
element = self.wait_until_visible('#invalid-name-help')
self.assertRegexpMatches(element.text.strip(),
- 'recipe with this name already exists')
+ 'image with this name already exists')
def test_new_duplicates_project_image(self):
"""