[gnome-continuous-yocto/gnomeostree-3.28-rocko: 915/8267] bitbake: toaster: selenium tests Update unique custom image string and fix import

[Emmanuele Bassi <ebassi src gnome org>]

commit f48feeb76dd9dad4eb8d15811104c6b6aa538e7d
Author: Michael Wood <michael g wood intel com>
Date:   Fri Jun 10 16:48:33 2016 +0100

    bitbake: 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
    
    (Bitbake rev: 830743b1aa29a5ac220141e9c24b2592d6cebb29)
    
    Signed-off-by: Michael Wood <michael g wood intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../tests/browser/test_builddashboard_page.py      |    2 +-
 .../tests/browser/test_new_custom_image_page.py    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py 
b/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py
index 5e08749..0d39abb 100644
--- a/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py
+++ b/bitbake/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/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py 
b/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py
index 8906cb2..ab5a8e6 100644
--- a/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py
+++ b/bitbake/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):
         """