mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 07:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: Update to use qemux86-64 machine by default

Browse Source 
Toaster currently uses qemux86 as the default, update to match the
local.conf default changes, i.e. qemux86-64.

(Bitbake rev: 27fbba9ee15994a69284a7f8579c22d85e0ce863)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2023-12-08 15:03:21 +00:00
parent e70f491b7e
commit 4d14176aa6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/toaster/orm/fixtures/settings.xml
View File

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

4
bitbake/lib/toaster/tests/functional/test_functional_basic.py
View File

@@ -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')

8
bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml
View File

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

2
bitbake/lib/toaster/toastergui/views.py
View File

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