From: Michael Wood <michael.g.wood@intel.com>
Date: Fri, 10 Jun 2016 15:48:33 +0000 (+0100)
Subject: toaster: selenium tests Update unique custom image string and fix import
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=830743b1aa29a5ac220141e9c24b2592d6cebb29;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/lib/toaster/tests/browser/test_builddashboard_page.py b/lib/toaster/tests/browser/test_builddashboard_page.py
index 5e087494704..0d39abb0506 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 8906cb27d97..ab5a8e66bea 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):
         """