It's useful to define the architecture that should be used in
situations such as:
* the intended target of the QEMU binary to be used on tests
* the architecture of code to be run within the QEMU binary, such
as a kernel image or a full blown guest OS image
This commit introduces both a test parameter and a test instance
attribute, that will contain such a value.
Now, when the "arch" test parameter is given, it will influence the
selection of the default QEMU binary, if one is not given explicitly
by means of the "qemu_img" parameter.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
docs/devel/testing.rst | 18 ++++++++++++++++++
tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index 44c9b3ae74..60a16c5834 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -689,6 +689,17 @@ vm
A QEMUMachine instance, initially configured according to the given
``qemu_bin`` parameter.
+arch
+~~~~
+
+The architecture that will be used on a number of different
+scenarios. For instance, when a QEMU binary is not explicitly given,
+the one selected will depend on this attribute.
+
+The ``arch`` attribute will be set to the test parameter of the same
+name, and if one is not given explicitly, it will default to the
+system architecture (as given by ``uname``).
+
qemu_bin
~~~~~~~~
@@ -711,6 +722,13 @@ like the following:
PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
+arch
+~~~~
+
+The architecture that will be used on a number of different scenarios.
+This parameter has a direct relation with the ``arch`` attribute. If
+not given, it will default to None.
+
qemu_bin
~~~~~~~~
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index d8d5b48dac..7a38851753 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -23,16 +23,22 @@ def is_readable_executable_file(path):
return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
-def pick_default_qemu_bin():
+def pick_default_qemu_bin(arch=None):
"""
Picks the path of a QEMU binary, starting either in the current working
directory or in the source tree root directory.
+ :param arch: the arch to use when looking for a QEMU binary (the target
+ will match the arch given). If None (the default) arch
+ will be the current host system arch (as given by
+ :func:`os.uname`).
+ :type arch: str
:returns: the path to the default QEMU binary or None if one could not
be found
:rtype: str or None
"""
- arch = os.uname()[4]
+ if arch is None:
+ arch = os.uname()[4]
qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
"qemu-system-%s" % arch)
if is_readable_executable_file(qemu_bin_relative_path):
@@ -47,8 +53,9 @@ def pick_default_qemu_bin():
class Test(avocado.Test):
def setUp(self):
self.vm = None
+ self.arch = self.params.get('arch')
self.qemu_bin = self.params.get('qemu_bin',
- default=pick_default_qemu_bin())
+ default=pick_default_qemu_bin(self.arch))
if self.qemu_bin is None:
self.cancel("No QEMU binary defined or found in the source tree")
self.vm = QEMUMachine(self.qemu_bin)
--
2.20.1
Hi, Cleber.
On Thu, Jan 17, 2019 at 01:56:15PM -0500, Cleber Rosa wrote:
> It's useful to define the architecture that should be used in
> situations such as:
> * the intended target of the QEMU binary to be used on tests
> * the architecture of code to be run within the QEMU binary, such
> as a kernel image or a full blown guest OS image
>
> This commit introduces both a test parameter and a test instance
> attribute, that will contain such a value.
>
> Now, when the "arch" test parameter is given, it will influence the
> selection of the default QEMU binary, if one is not given explicitly
> by means of the "qemu_img" parameter.
>
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> ---
> docs/devel/testing.rst | 18 ++++++++++++++++++
> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
> 2 files changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
> index 44c9b3ae74..60a16c5834 100644
> --- a/docs/devel/testing.rst
> +++ b/docs/devel/testing.rst
> @@ -689,6 +689,17 @@ vm
> A QEMUMachine instance, initially configured according to the given
> ``qemu_bin`` parameter.
>
> +arch
> +~~~~
> +
> +The architecture that will be used on a number of different
> +scenarios. For instance, when a QEMU binary is not explicitly given,
> +the one selected will depend on this attribute.
> +
> +The ``arch`` attribute will be set to the test parameter of the same
> +name, and if one is not given explicitly, it will default to the
> +system architecture (as given by ``uname``).
Would you think it's important to make explicit that it's the *host*
system architecture? Just like you did in the docstrings of
pick_default_qemu_bin().
> +
> qemu_bin
> ~~~~~~~~
>
> @@ -711,6 +722,13 @@ like the following:
>
> PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
>
> +arch
> +~~~~
> +
> +The architecture that will be used on a number of different scenarios.
> +This parameter has a direct relation with the ``arch`` attribute. If
> +not given, it will default to None.
> +
> qemu_bin
> ~~~~~~~~
>
> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
> index d8d5b48dac..7a38851753 100644
> --- a/tests/acceptance/avocado_qemu/__init__.py
> +++ b/tests/acceptance/avocado_qemu/__init__.py
> @@ -23,16 +23,22 @@ def is_readable_executable_file(path):
> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
>
>
> -def pick_default_qemu_bin():
> +def pick_default_qemu_bin(arch=None):
> """
> Picks the path of a QEMU binary, starting either in the current working
> directory or in the source tree root directory.
>
> + :param arch: the arch to use when looking for a QEMU binary (the target
> + will match the arch given). If None (the default) arch
> + will be the current host system arch (as given by
> + :func:`os.uname`).
> + :type arch: str
> :returns: the path to the default QEMU binary or None if one could not
> be found
> :rtype: str or None
> """
> - arch = os.uname()[4]
> + if arch is None:
> + arch = os.uname()[4]
> qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
> "qemu-system-%s" % arch)
> if is_readable_executable_file(qemu_bin_relative_path):
> @@ -47,8 +53,9 @@ def pick_default_qemu_bin():
> class Test(avocado.Test):
> def setUp(self):
> self.vm = None
> + self.arch = self.params.get('arch')
> self.qemu_bin = self.params.get('qemu_bin',
> - default=pick_default_qemu_bin())
> + default=pick_default_qemu_bin(self.arch))
Since it was used the named argument in function declaration I think
it's more consistent also use the argument name here in the function
call: `pick_default_qemu_bin(arch=self.arch)`
> if self.qemu_bin is None:
> self.cancel("No QEMU binary defined or found in the source tree")
> self.vm = QEMUMachine(self.qemu_bin)
> --
> 2.20.1
>
Thanks,
--
Caio Carrara
Software Engineer, Virt Team - Red Hat
ccarrara@redhat.com
On 1/18/19 3:28 PM, Caio Carrara wrote:
> Hi, Cleber.
>
> On Thu, Jan 17, 2019 at 01:56:15PM -0500, Cleber Rosa wrote:
>> It's useful to define the architecture that should be used in
>> situations such as:
>> * the intended target of the QEMU binary to be used on tests
>> * the architecture of code to be run within the QEMU binary, such
>> as a kernel image or a full blown guest OS image
>>
>> This commit introduces both a test parameter and a test instance
>> attribute, that will contain such a value.
>>
>> Now, when the "arch" test parameter is given, it will influence the
>> selection of the default QEMU binary, if one is not given explicitly
>> by means of the "qemu_img" parameter.
>>
>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>> ---
>> docs/devel/testing.rst | 18 ++++++++++++++++++
>> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
>> 2 files changed, 28 insertions(+), 3 deletions(-)
>>
>> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
>> index 44c9b3ae74..60a16c5834 100644
>> --- a/docs/devel/testing.rst
>> +++ b/docs/devel/testing.rst
>> @@ -689,6 +689,17 @@ vm
>> A QEMUMachine instance, initially configured according to the given
>> ``qemu_bin`` parameter.
>>
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different
>> +scenarios. For instance, when a QEMU binary is not explicitly given,
>> +the one selected will depend on this attribute.
>> +
>> +The ``arch`` attribute will be set to the test parameter of the same
>> +name, and if one is not given explicitly, it will default to the
>> +system architecture (as given by ``uname``).
>
> Would you think it's important to make explicit that it's the *host*
> system architecture? Just like you did in the docstrings of
> pick_default_qemu_bin().
Agreed.
>
>> +
>> qemu_bin
>> ~~~~~~~~
>>
>> @@ -711,6 +722,13 @@ like the following:
>>
>> PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
>>
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different scenarios.
>> +This parameter has a direct relation with the ``arch`` attribute. If
>> +not given, it will default to None.
>> +
>> qemu_bin
>> ~~~~~~~~
>>
>> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
>> index d8d5b48dac..7a38851753 100644
>> --- a/tests/acceptance/avocado_qemu/__init__.py
>> +++ b/tests/acceptance/avocado_qemu/__init__.py
>> @@ -23,16 +23,22 @@ def is_readable_executable_file(path):
>> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
>>
>>
>> -def pick_default_qemu_bin():
>> +def pick_default_qemu_bin(arch=None):
>> """
>> Picks the path of a QEMU binary, starting either in the current working
>> directory or in the source tree root directory.
>>
>> + :param arch: the arch to use when looking for a QEMU binary (the target
>> + will match the arch given). If None (the default) arch
>> + will be the current host system arch (as given by
>> + :func:`os.uname`).
\o/ thanks :)
>> + :type arch: str
>> :returns: the path to the default QEMU binary or None if one could not
>> be found
>> :rtype: str or None
>> """
>> - arch = os.uname()[4]
>> + if arch is None:
>> + arch = os.uname()[4]
>> qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
>> "qemu-system-%s" % arch)
>> if is_readable_executable_file(qemu_bin_relative_path):
>> @@ -47,8 +53,9 @@ def pick_default_qemu_bin():
>> class Test(avocado.Test):
>> def setUp(self):
>> self.vm = None
>> + self.arch = self.params.get('arch')
>> self.qemu_bin = self.params.get('qemu_bin',
>> - default=pick_default_qemu_bin())
>> + default=pick_default_qemu_bin(self.arch))
>
> Since it was used the named argument in function declaration I think
> it's more consistent also use the argument name here in the function
> call: `pick_default_qemu_bin(arch=self.arch)`
With Caio's comments addressed:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>> if self.qemu_bin is None:
>> self.cancel("No QEMU binary defined or found in the source tree")
>> self.vm = QEMUMachine(self.qemu_bin)
>> --
>> 2.20.1
>>
>
> Thanks,
>
On 1/18/19 9:28 AM, Caio Carrara wrote: > Hi, Cleber. > > On Thu, Jan 17, 2019 at 01:56:15PM -0500, Cleber Rosa wrote: >> It's useful to define the architecture that should be used in >> situations such as: >> * the intended target of the QEMU binary to be used on tests >> * the architecture of code to be run within the QEMU binary, such >> as a kernel image or a full blown guest OS image >> >> This commit introduces both a test parameter and a test instance >> attribute, that will contain such a value. >> >> Now, when the "arch" test parameter is given, it will influence the >> selection of the default QEMU binary, if one is not given explicitly >> by means of the "qemu_img" parameter. >> >> Signed-off-by: Cleber Rosa <crosa@redhat.com> >> --- >> docs/devel/testing.rst | 18 ++++++++++++++++++ >> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++--- >> 2 files changed, 28 insertions(+), 3 deletions(-) >> >> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst >> index 44c9b3ae74..60a16c5834 100644 >> --- a/docs/devel/testing.rst >> +++ b/docs/devel/testing.rst >> @@ -689,6 +689,17 @@ vm >> A QEMUMachine instance, initially configured according to the given >> ``qemu_bin`` parameter. >> >> +arch >> +~~~~ >> + >> +The architecture that will be used on a number of different >> +scenarios. For instance, when a QEMU binary is not explicitly given, >> +the one selected will depend on this attribute. >> + >> +The ``arch`` attribute will be set to the test parameter of the same >> +name, and if one is not given explicitly, it will default to the >> +system architecture (as given by ``uname``). > > Would you think it's important to make explicit that it's the *host* > system architecture? Just like you did in the docstrings of > pick_default_qemu_bin(). > Yes, you're right. Adding that.
On 1/18/19 9:28 AM, Caio Carrara wrote:
> Hi, Cleber.
>
> On Thu, Jan 17, 2019 at 01:56:15PM -0500, Cleber Rosa wrote:
>> It's useful to define the architecture that should be used in
>> situations such as:
>> * the intended target of the QEMU binary to be used on tests
>> * the architecture of code to be run within the QEMU binary, such
>> as a kernel image or a full blown guest OS image
>>
>> This commit introduces both a test parameter and a test instance
>> attribute, that will contain such a value.
>>
>> Now, when the "arch" test parameter is given, it will influence the
>> selection of the default QEMU binary, if one is not given explicitly
>> by means of the "qemu_img" parameter.
>>
>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>> ---
>> docs/devel/testing.rst | 18 ++++++++++++++++++
>> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
>> 2 files changed, 28 insertions(+), 3 deletions(-)
>>
>> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
>> index 44c9b3ae74..60a16c5834 100644
>> --- a/docs/devel/testing.rst
>> +++ b/docs/devel/testing.rst
>> @@ -689,6 +689,17 @@ vm
>> A QEMUMachine instance, initially configured according to the given
>> ``qemu_bin`` parameter.
>>
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different
>> +scenarios. For instance, when a QEMU binary is not explicitly given,
>> +the one selected will depend on this attribute.
>> +
>> +The ``arch`` attribute will be set to the test parameter of the same
>> +name, and if one is not given explicitly, it will default to the
>> +system architecture (as given by ``uname``).
>
> Would you think it's important to make explicit that it's the *host*
> system architecture? Just like you did in the docstrings of
> pick_default_qemu_bin().
>
>> +
>> qemu_bin
>> ~~~~~~~~
>>
>> @@ -711,6 +722,13 @@ like the following:
>>
>> PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
>>
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different scenarios.
>> +This parameter has a direct relation with the ``arch`` attribute. If
>> +not given, it will default to None.
>> +
>> qemu_bin
>> ~~~~~~~~
>>
>> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
>> index d8d5b48dac..7a38851753 100644
>> --- a/tests/acceptance/avocado_qemu/__init__.py
>> +++ b/tests/acceptance/avocado_qemu/__init__.py
>> @@ -23,16 +23,22 @@ def is_readable_executable_file(path):
>> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
>>
>>
>> -def pick_default_qemu_bin():
>> +def pick_default_qemu_bin(arch=None):
>> """
>> Picks the path of a QEMU binary, starting either in the current working
>> directory or in the source tree root directory.
>>
>> + :param arch: the arch to use when looking for a QEMU binary (the target
>> + will match the arch given). If None (the default) arch
>> + will be the current host system arch (as given by
>> + :func:`os.uname`).
>> + :type arch: str
>> :returns: the path to the default QEMU binary or None if one could not
>> be found
>> :rtype: str or None
>> """
>> - arch = os.uname()[4]
>> + if arch is None:
>> + arch = os.uname()[4]
>> qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
>> "qemu-system-%s" % arch)
>> if is_readable_executable_file(qemu_bin_relative_path):
>> @@ -47,8 +53,9 @@ def pick_default_qemu_bin():
>> class Test(avocado.Test):
>> def setUp(self):
>> self.vm = None
>> + self.arch = self.params.get('arch')
>> self.qemu_bin = self.params.get('qemu_bin',
>> - default=pick_default_qemu_bin())
>> + default=pick_default_qemu_bin(self.arch))
>
> Since it was used the named argument in function declaration I think
> it's more consistent also use the argument name here in the function
> call: `pick_default_qemu_bin(arch=self.arch)`
>
Oops, I missed this part of your review in the previous message.
Anyway, I don't see a problem with either approach, so I'm fine changing it.
- Cleber.
Hi Cleber,
On 01/17/2019 04:56 PM, Cleber Rosa wrote:
> It's useful to define the architecture that should be used in
> situations such as:
> * the intended target of the QEMU binary to be used on tests
> * the architecture of code to be run within the QEMU binary, such
> as a kernel image or a full blown guest OS image
>
> This commit introduces both a test parameter and a test instance
> attribute, that will contain such a value.
>
> Now, when the "arch" test parameter is given, it will influence the
> selection of the default QEMU binary, if one is not given explicitly
> by means of the "qemu_img" parameter.
>
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> ---
> docs/devel/testing.rst | 18 ++++++++++++++++++
> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
> 2 files changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
> index 44c9b3ae74..60a16c5834 100644
> --- a/docs/devel/testing.rst
> +++ b/docs/devel/testing.rst
> @@ -689,6 +689,17 @@ vm
> A QEMUMachine instance, initially configured according to the given
> ``qemu_bin`` parameter.
>
> +arch
> +~~~~
> +
> +The architecture that will be used on a number of different
> +scenarios. For instance, when a QEMU binary is not explicitly given,
> +the one selected will depend on this attribute.
> +
> +The ``arch`` attribute will be set to the test parameter of the same
> +name, and if one is not given explicitly, it will default to the
> +system architecture (as given by ``uname``).
Unless I'm missing something, the arch attribute will be None if I don't
pass the arch parameter nor set the arch tag.
------
[root@xxx qemu]# cat tests/acceptance/arch.py
from avocado_qemu import Test
class Arch(Test):
"""
:avocado: enable
"""
def test(self):
self.assertEqual(self.arch, "x86_64")
[root@xxx qemu]# ./tests/venv/bin/avocado run tests/acceptance/arch.py
JOB ID : 032aabb8ec2364944d0e29df3b61931b42f4587c
JOB LOG : /root/avocado/job-results/job-2019-01-31T08.42-032aabb/job.log
(1/1) tests/acceptance/arch.py:Arch.test: FAIL: None != 'x86_64' (0.03 s)
RESULTS : PASS 0 | ERROR 0 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 |
CANCEL 0
JOB TIME : 0.20 s
[root@xxx qemu]# ./tests/venv/bin/avocado run -p arch=x86_64
tests/acceptance/arch.py
JOB ID : 1913a73510cab4b6b118bd7e94e2746011368628
JOB LOG : /root/avocado/job-results/job-2019-01-31T08.42-1913a73/job.log
(1/1) tests/acceptance/arch.py:Arch.test: PASS (0.01 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 |
CANCEL 0
JOB TIME : 0.19 s
[root@xxx qemu]# cat tests/acceptance/arch_tag.py
from avocado_qemu import Test
class Arch(Test):
"""
:avocado: enable
:avocado: tags=arch:x86_64
"""
def test(self):
self.assertEqual(self.arch, "x86_64")
[root@xxx qemu]# ./tests/venv/bin/avocado run tests/acceptance/arch_tag.py
JOB ID : bc85be065586b8e9cf371489e1801489910e41b0
JOB LOG : /root/avocado/job-results/job-2019-01-31T08.43-bc85be0/job.log
(1/1) tests/acceptance/arch_tag.py:Arch.test: PASS (0.01 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 |
CANCEL 0
JOB TIME : 0.19 s
------
- Wainer
> +
> qemu_bin
> ~~~~~~~~
>
> @@ -711,6 +722,13 @@ like the following:
>
> PARAMS (key=qemu_bin, path=*, default=x86_64-softmmu/qemu-system-x86_64) => 'x86_64-softmmu/qemu-system-x86_64
>
> +arch
> +~~~~
> +
> +The architecture that will be used on a number of different scenarios.
> +This parameter has a direct relation with the ``arch`` attribute. If
> +not given, it will default to None.
> +
> qemu_bin
> ~~~~~~~~
>
> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
> index d8d5b48dac..7a38851753 100644
> --- a/tests/acceptance/avocado_qemu/__init__.py
> +++ b/tests/acceptance/avocado_qemu/__init__.py
> @@ -23,16 +23,22 @@ def is_readable_executable_file(path):
> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
>
>
> -def pick_default_qemu_bin():
> +def pick_default_qemu_bin(arch=None):
> """
> Picks the path of a QEMU binary, starting either in the current working
> directory or in the source tree root directory.
>
> + :param arch: the arch to use when looking for a QEMU binary (the target
> + will match the arch given). If None (the default) arch
> + will be the current host system arch (as given by
> + :func:`os.uname`).
> + :type arch: str
> :returns: the path to the default QEMU binary or None if one could not
> be found
> :rtype: str or None
> """
> - arch = os.uname()[4]
> + if arch is None:
> + arch = os.uname()[4]
> qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
> "qemu-system-%s" % arch)
> if is_readable_executable_file(qemu_bin_relative_path):
> @@ -47,8 +53,9 @@ def pick_default_qemu_bin():
> class Test(avocado.Test):
> def setUp(self):
> self.vm = None
> + self.arch = self.params.get('arch')
> self.qemu_bin = self.params.get('qemu_bin',
> - default=pick_default_qemu_bin())
> + default=pick_default_qemu_bin(self.arch))
> if self.qemu_bin is None:
> self.cancel("No QEMU binary defined or found in the source tree")
> self.vm = QEMUMachine(self.qemu_bin)
On 1/31/19 8:55 AM, Wainer dos Santos Moschetta wrote:
> Hi Cleber,
>
> On 01/17/2019 04:56 PM, Cleber Rosa wrote:
>> It's useful to define the architecture that should be used in
>> situations such as:
>> * the intended target of the QEMU binary to be used on tests
>> * the architecture of code to be run within the QEMU binary, such
>> as a kernel image or a full blown guest OS image
>>
>> This commit introduces both a test parameter and a test instance
>> attribute, that will contain such a value.
>>
>> Now, when the "arch" test parameter is given, it will influence the
>> selection of the default QEMU binary, if one is not given explicitly
>> by means of the "qemu_img" parameter.
>>
>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>> ---
>> docs/devel/testing.rst | 18 ++++++++++++++++++
>> tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++---
>> 2 files changed, 28 insertions(+), 3 deletions(-)
>>
>> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
>> index 44c9b3ae74..60a16c5834 100644
>> --- a/docs/devel/testing.rst
>> +++ b/docs/devel/testing.rst
>> @@ -689,6 +689,17 @@ vm
>> A QEMUMachine instance, initially configured according to the given
>> ``qemu_bin`` parameter.
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different
>> +scenarios. For instance, when a QEMU binary is not explicitly given,
>> +the one selected will depend on this attribute.
>> +
>> +The ``arch`` attribute will be set to the test parameter of the same
>> +name, and if one is not given explicitly, it will default to the
>> +system architecture (as given by ``uname``).
>
> Unless I'm missing something, the arch attribute will be None if I don't
> pass the arch parameter nor set the arch tag.
>
I think you're not missing anything, but I was. Thanks for catching that.
- Cleber.
> ------
> [root@xxx qemu]# cat tests/acceptance/arch.py
> from avocado_qemu import Test
>
> class Arch(Test):
> """
> :avocado: enable
> """
> def test(self):
> self.assertEqual(self.arch, "x86_64")
> [root@xxx qemu]# ./tests/venv/bin/avocado run tests/acceptance/arch.py
> JOB ID : 032aabb8ec2364944d0e29df3b61931b42f4587c
> JOB LOG : /root/avocado/job-results/job-2019-01-31T08.42-032aabb/job.log
> (1/1) tests/acceptance/arch.py:Arch.test: FAIL: None != 'x86_64' (0.03 s)
> RESULTS : PASS 0 | ERROR 0 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 |
> CANCEL 0
> JOB TIME : 0.20 s
> [root@xxx qemu]# ./tests/venv/bin/avocado run -p arch=x86_64
> tests/acceptance/arch.py
> JOB ID : 1913a73510cab4b6b118bd7e94e2746011368628
> JOB LOG : /root/avocado/job-results/job-2019-01-31T08.42-1913a73/job.log
> (1/1) tests/acceptance/arch.py:Arch.test: PASS (0.01 s)
> RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 |
> CANCEL 0
> JOB TIME : 0.19 s
> [root@xxx qemu]# cat tests/acceptance/arch_tag.py
> from avocado_qemu import Test
>
> class Arch(Test):
> """
> :avocado: enable
> :avocado: tags=arch:x86_64
> """
> def test(self):
> self.assertEqual(self.arch, "x86_64")
> [root@xxx qemu]# ./tests/venv/bin/avocado run tests/acceptance/arch_tag.py
> JOB ID : bc85be065586b8e9cf371489e1801489910e41b0
> JOB LOG : /root/avocado/job-results/job-2019-01-31T08.43-bc85be0/job.log
> (1/1) tests/acceptance/arch_tag.py:Arch.test: PASS (0.01 s)
> RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 |
> CANCEL 0
> JOB TIME : 0.19 s
> ------
>
> - Wainer
>
>> +
>> qemu_bin
>> ~~~~~~~~
>> @@ -711,6 +722,13 @@ like the following:
>> PARAMS (key=qemu_bin, path=*,
>> default=x86_64-softmmu/qemu-system-x86_64) =>
>> 'x86_64-softmmu/qemu-system-x86_64
>> +arch
>> +~~~~
>> +
>> +The architecture that will be used on a number of different scenarios.
>> +This parameter has a direct relation with the ``arch`` attribute. If
>> +not given, it will default to None.
>> +
>> qemu_bin
>> ~~~~~~~~
>> diff --git a/tests/acceptance/avocado_qemu/__init__.py
>> b/tests/acceptance/avocado_qemu/__init__.py
>> index d8d5b48dac..7a38851753 100644
>> --- a/tests/acceptance/avocado_qemu/__init__.py
>> +++ b/tests/acceptance/avocado_qemu/__init__.py
>> @@ -23,16 +23,22 @@ def is_readable_executable_file(path):
>> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
>> -def pick_default_qemu_bin():
>> +def pick_default_qemu_bin(arch=None):
>> """
>> Picks the path of a QEMU binary, starting either in the current
>> working
>> directory or in the source tree root directory.
>> + :param arch: the arch to use when looking for a QEMU binary
>> (the target
>> + will match the arch given). If None (the default) arch
>> + will be the current host system arch (as given by
>> + :func:`os.uname`).
>> + :type arch: str
>> :returns: the path to the default QEMU binary or None if one
>> could not
>> be found
>> :rtype: str or None
>> """
>> - arch = os.uname()[4]
>> + if arch is None:
>> + arch = os.uname()[4]
>> qemu_bin_relative_path = os.path.join("%s-softmmu" % arch,
>> "qemu-system-%s" % arch)
>> if is_readable_executable_file(qemu_bin_relative_path):
>> @@ -47,8 +53,9 @@ def pick_default_qemu_bin():
>> class Test(avocado.Test):
>> def setUp(self):
>> self.vm = None
>> + self.arch = self.params.get('arch')
>> self.qemu_bin = self.params.get('qemu_bin',
>> - default=pick_default_qemu_bin())
>> +
>> default=pick_default_qemu_bin(self.arch))
>> if self.qemu_bin is None:
>> self.cancel("No QEMU binary defined or found in the
>> source tree")
>> self.vm = QEMUMachine(self.qemu_bin)
>
--
Cleber Rosa
[ Sr Software Engineer - Virtualization Team - Red Hat ]
[ Avocado Test Framework - avocado-framework.github.io ]
[ 7ABB 96EB 8B46 B94D 5E0F E9BB 657E 8D33 A5F2 09F3 ]
© 2016 - 2026 Red Hat, Inc.