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:04:12 +0000 |
commit | 4d14176aa69d5e39a3cef01f6741ac0f2a2080ee (patch) | |
tree | ae82a8f9a5c749416c4ea963a5c76d27227de4d4 | |
parent | e70f491b7eb2df47be7f9fe919704b5e32b626e5 (diff) | |
download | poky-4d14176aa69d5e39a3cef01f6741ac0f2a2080ee.tar.gz |
bitbake: 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.
(Bitbake rev: 27fbba9ee15994a69284a7f8579c22d85e0ce863)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/settings.xml b/bitbake/lib/toaster/orm/fixtures/settings.xml index ab3ea021f5..02c26a6974 100644 --- a/bitbake/lib/toaster/orm/fixtures/settings.xml +++ b/bitbake/lib/toaster/orm/fixtures/settings.xml | |||
@@ -12,7 +12,7 @@ | |||
12 | </object> | 12 | </object> |
13 | <object model="orm.toastersetting" pk="4"> | 13 | <object model="orm.toastersetting" pk="4"> |
14 | <field type="CharField" name="name">DEFCONF_MACHINE</field> | 14 | <field type="CharField" name="name">DEFCONF_MACHINE</field> |
15 | <field type="CharField" name="value">qemux86</field> | 15 | <field type="CharField" name="value">qemux86-64</field> |
16 | </object> | 16 | </object> |
17 | <object model="orm.toastersetting" pk="5"> | 17 | <object model="orm.toastersetting" pk="5"> |
18 | <field type="CharField" name="name">DEFCONF_SSTATE_DIR</field> | 18 | <field type="CharField" name="name">DEFCONF_SSTATE_DIR</field> |
diff --git a/bitbake/lib/toaster/tests/functional/test_functional_basic.py b/bitbake/lib/toaster/tests/functional/test_functional_basic.py index f558cce884..dcd84c3f64 100644 --- a/bitbake/lib/toaster/tests/functional/test_functional_basic.py +++ b/bitbake/lib/toaster/tests/functional/test_functional_basic.py | |||
@@ -93,7 +93,7 @@ class FuntionalTestBasic(SeleniumFunctionalTestCase): | |||
93 | time.sleep(2) | 93 | time.sleep(2) |
94 | try: | 94 | try: |
95 | self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') | 95 | self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') |
96 | self.assertTrue(re.search("qemux86",self.driver.find_element(By.XPATH, "//span[@id='project-machine-name']").text),'The machine type is not assigned') | 96 | self.assertTrue(re.search("qemux86-64",self.driver.find_element(By.XPATH, "//span[@id='project-machine-name']").text),'The machine type is not assigned') |
97 | self.driver.find_element(By.XPATH, "//span[@id='change-machine-toggle']").click() | 97 | self.driver.find_element(By.XPATH, "//span[@id='change-machine-toggle']").click() |
98 | time.sleep(2) | 98 | time.sleep(2) |
99 | self.wait_until_visible('#select-machine-form') | 99 | self.wait_until_visible('#select-machine-form') |
@@ -140,7 +140,7 @@ class FuntionalTestBasic(SeleniumFunctionalTestCase): | |||
140 | 140 | ||
141 | try: | 141 | try: |
142 | self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') | 142 | self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') |
143 | self.assertTrue(re.search("qemux86",self.driver.find_element(By.ID, "project-machine-name").text),'The machine type is not assigned') | 143 | self.assertTrue(re.search("qemux86-64",self.driver.find_element(By.ID, "project-machine-name").text),'The machine type is not assigned') |
144 | self.driver.find_element(By.ID, "change-machine-toggle").click() | 144 | self.driver.find_element(By.ID, "change-machine-toggle").click() |
145 | time.sleep(2) | 145 | time.sleep(2) |
146 | self.wait_until_visible('#select-machine-form') | 146 | self.wait_until_visible('#select-machine-form') |
diff --git a/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml b/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml index df106934b2..f626572fd1 100644 --- a/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml +++ b/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml | |||
@@ -46,12 +46,12 @@ | |||
46 | <object pk="1" model="orm.ProjectVariable"> | 46 | <object pk="1" model="orm.ProjectVariable"> |
47 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> | 47 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> |
48 | <field type="CharField" name="name">MACHINE</field> | 48 | <field type="CharField" name="name">MACHINE</field> |
49 | <field type="TextField" name="value">qemux86</field> | 49 | <field type="TextField" name="value">qemux86-64</field> |
50 | </object> | 50 | </object> |
51 | <object pk="2" model="orm.ProjectVariable"> | 51 | <object pk="2" model="orm.ProjectVariable"> |
52 | <field to="orm.project" name="project" rel="ManyToOneRel">2</field> | 52 | <field to="orm.project" name="project" rel="ManyToOneRel">2</field> |
53 | <field type="CharField" name="name">MACHINE</field> | 53 | <field type="CharField" name="name">MACHINE</field> |
54 | <field type="TextField" name="value">qemux86</field> | 54 | <field type="TextField" name="value">qemux86-64</field> |
55 | </object> | 55 | </object> |
56 | <object pk="1" model="orm.build"> | 56 | <object pk="1" model="orm.build"> |
57 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> | 57 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> |
@@ -79,7 +79,7 @@ | |||
79 | </object> | 79 | </object> |
80 | <object pk="3" model="orm.build"> | 80 | <object pk="3" model="orm.build"> |
81 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> | 81 | <field to="orm.project" name="project" rel="ManyToOneRel">1</field> |
82 | <field type="CharField" name="machine">qemux86</field> | 82 | <field type="CharField" name="machine">qemux86-64</field> |
83 | <field type="CharField" name="distro"></field> | 83 | <field type="CharField" name="distro"></field> |
84 | <field type="CharField" name="distro_version"></field> | 84 | <field type="CharField" name="distro_version"></field> |
85 | <field type="DateTimeField" name="started_on">2016-02-12T18:46:20.114530+00:00</field> | 85 | <field type="DateTimeField" name="started_on">2016-02-12T18:46:20.114530+00:00</field> |
@@ -91,7 +91,7 @@ | |||
91 | </object> | 91 | </object> |
92 | <object pk="4" model="orm.build"> | 92 | <object pk="4" model="orm.build"> |
93 | <field to="orm.project" name="project" rel="ManyToOneRel">2</field> | 93 | <field to="orm.project" name="project" rel="ManyToOneRel">2</field> |
94 | <field type="CharField" name="machine">qemux86</field> | 94 | <field type="CharField" name="machine">qemux86-64</field> |
95 | <field type="CharField" name="distro"></field> | 95 | <field type="CharField" name="distro"></field> |
96 | <field type="CharField" name="distro_version"></field> | 96 | <field type="CharField" name="distro_version"></field> |
97 | <field type="DateTimeField" name="started_on">2016-02-11T18:46:20.114530+00:00</field> | 97 | <field type="DateTimeField" name="started_on">2016-02-11T18:46:20.114530+00:00</field> |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index cc8517ba6c..735d304ad8 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1610,7 +1610,7 @@ if True: | |||
1610 | # make sure we have a machine set for this project | 1610 | # make sure we have a machine set for this project |
1611 | ProjectVariable.objects.get_or_create(project=new_project, | 1611 | ProjectVariable.objects.get_or_create(project=new_project, |
1612 | name="MACHINE", | 1612 | name="MACHINE", |
1613 | value="qemux86") | 1613 | value="qemux86-64") |
1614 | context = {'project': new_project} | 1614 | context = {'project': new_project} |
1615 | return toaster_render(request, "js-unit-tests.html", context) | 1615 | return toaster_render(request, "js-unit-tests.html", context) |
1616 | 1616 | ||