diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-08 15:03:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-09 10:02:57 +0000 |
commit | 27fbba9ee15994a69284a7f8579c22d85e0ce863 (patch) | |
tree | 2037a026a78180c14ccf215729ad01564d2d6dcf | |
parent | e91c256ec076e70cf8a18e369fe7862e50618c48 (diff) | |
download | bitbake-27fbba9ee15994a69284a7f8579c22d85e0ce863.tar.gz |
toaster: Update to use qemux86-64 machine by default
Toaster currently uses qemux86 as the default, update to match the
local.conf default changes, i.e. qemux86-64.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/toaster/orm/fixtures/settings.xml | 2 | ||||
-rw-r--r-- | lib/toaster/tests/functional/test_functional_basic.py | 4 | ||||
-rw-r--r-- | lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml | 8 | ||||
-rw-r--r-- | lib/toaster/toastergui/views.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/toaster/orm/fixtures/settings.xml b/lib/toaster/orm/fixtures/settings.xml index ab3ea021f..02c26a697 100644 --- a/lib/toaster/orm/fixtures/settings.xml +++ b/lib/toaster/orm/fixtures/settings.xml @@ -12,7 +12,7 @@ </object> <object model="orm.toastersetting" pk="4"> <field type="CharField" name="name">DEFCONF_MACHINE</field> - <field type="CharField" name="value">qemux86</field> + <field type="CharField" name="value">qemux86-64</field> </object> <object model="orm.toastersetting" pk="5"> <field type="CharField" name="name">DEFCONF_SSTATE_DIR</field> diff --git a/lib/toaster/tests/functional/test_functional_basic.py b/lib/toaster/tests/functional/test_functional_basic.py index f558cce88..dcd84c3f6 100644 --- a/lib/toaster/tests/functional/test_functional_basic.py +++ b/lib/toaster/tests/functional/test_functional_basic.py @@ -93,7 +93,7 @@ class FuntionalTestBasic(SeleniumFunctionalTestCase): time.sleep(2) try: self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') - self.assertTrue(re.search("qemux86",self.driver.find_element(By.XPATH, "//span[@id='project-machine-name']").text),'The machine type is not assigned') + self.assertTrue(re.search("qemux86-64",self.driver.find_element(By.XPATH, "//span[@id='project-machine-name']").text),'The machine type is not assigned') self.driver.find_element(By.XPATH, "//span[@id='change-machine-toggle']").click() time.sleep(2) self.wait_until_visible('#select-machine-form') @@ -140,7 +140,7 @@ class FuntionalTestBasic(SeleniumFunctionalTestCase): try: self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') - self.assertTrue(re.search("qemux86",self.driver.find_element(By.ID, "project-machine-name").text),'The machine type is not assigned') + self.assertTrue(re.search("qemux86-64",self.driver.find_element(By.ID, "project-machine-name").text),'The machine type is not assigned') self.driver.find_element(By.ID, "change-machine-toggle").click() time.sleep(2) self.wait_until_visible('#select-machine-form') diff --git a/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml b/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml index df106934b..f626572fd 100644 --- a/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml +++ b/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml @@ -46,12 +46,12 @@ <object pk="1" model="orm.ProjectVariable"> <field to="orm.project" name="project" rel="ManyToOneRel">1</field> <field type="CharField" name="name">MACHINE</field> - <field type="TextField" name="value">qemux86</field> + <field type="TextField" name="value">qemux86-64</field> </object> <object pk="2" model="orm.ProjectVariable"> <field to="orm.project" name="project" rel="ManyToOneRel">2</field> <field type="CharField" name="name">MACHINE</field> - <field type="TextField" name="value">qemux86</field> + <field type="TextField" name="value">qemux86-64</field> </object> <object pk="1" model="orm.build"> <field to="orm.project" name="project" rel="ManyToOneRel">1</field> @@ -79,7 +79,7 @@ </object> <object pk="3" model="orm.build"> <field to="orm.project" name="project" rel="ManyToOneRel">1</field> - <field type="CharField" name="machine">qemux86</field> + <field type="CharField" name="machine">qemux86-64</field> <field type="CharField" name="distro"></field> <field type="CharField" name="distro_version"></field> <field type="DateTimeField" name="started_on">2016-02-12T18:46:20.114530+00:00</field> @@ -91,7 +91,7 @@ </object> <object pk="4" model="orm.build"> <field to="orm.project" name="project" rel="ManyToOneRel">2</field> - <field type="CharField" name="machine">qemux86</field> + <field type="CharField" name="machine">qemux86-64</field> <field type="CharField" name="distro"></field> <field type="CharField" name="distro_version"></field> <field type="DateTimeField" name="started_on">2016-02-11T18:46:20.114530+00:00</field> diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index cc8517ba6..735d304ad 100644 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -1610,7 +1610,7 @@ if True: # make sure we have a machine set for this project ProjectVariable.objects.get_or_create(project=new_project, name="MACHINE", - value="qemux86") + value="qemux86-64") context = {'project': new_project} return toaster_render(request, "js-unit-tests.html", context) |