qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>
Subject: [PULL 12/18] tests/acceptance/virtiofs_submounts: use workdir property
Date: Mon,  8 Feb 2021 14:37:05 +0100	[thread overview]
Message-ID: <20210208133711.2596075-13-philmd@redhat.com> (raw)
In-Reply-To: <20210208133711.2596075-1-philmd@redhat.com>

From: Cleber Rosa <crosa@redhat.com>

For Avocado Instrumented based tests, it's a better idea to just use
the property.  The environment variable is a fall back for tests not
written using that Python API.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reference: https://avocado-framework.readthedocs.io/en/84.0/api/test/avocado.html#avocado.Test.workdir
Message-Id: <20210203172357.1422425-5-crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/virtiofs_submounts.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virtiofs_submounts.py
index 361e5990b65..68d3cd68696 100644
--- a/tests/acceptance/virtiofs_submounts.py
+++ b/tests/acceptance/virtiofs_submounts.py
@@ -136,8 +136,7 @@ def run(self, args, ignore_error=False):
         return (stdout, stderr, ret)
 
     def set_up_shared_dir(self):
-        atwd = os.getenv('AVOCADO_TEST_WORKDIR')
-        self.shared_dir = os.path.join(atwd, 'virtiofs-shared')
+        self.shared_dir = os.path.join(self.workdir, 'virtiofs-shared')
 
         os.mkdir(self.shared_dir)
 
@@ -234,8 +233,7 @@ def setUp(self):
 
         self.seed = self.params.get('seed')
 
-        atwd = os.getenv('AVOCADO_TEST_WORKDIR')
-        self.ssh_key = os.path.join(atwd, 'id_ed25519')
+        self.ssh_key = os.path.join(self.workdir, 'id_ed25519')
 
         self.run(('ssh-keygen', '-t', 'ed25519', '-f', self.ssh_key))
 
-- 
2.26.2



  parent reply	other threads:[~2021-02-08 19:31 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-08 13:36 [PULL 00/18] Integration testing patches for 2021-02-08 Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 02/18] tests/acceptance: Introduce tesseract_ocr() helper Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 03/18] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 04/18] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 05/18] tests/acceptance: Move the pseries test to a separate file Philippe Mathieu-Daudé
2021-02-08 13:36 ` [PULL 06/18] tests/acceptance: Test the mpc8544ds machine Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 07/18] tests/acceptance: Add a test for the virtex-ml507 ppc machine Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 08/18] tests/acceptance: Increase the timeout in the replay tests Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 09/18] tests/acceptance: Re-enable the microblaze test Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 10/18] tests/acceptance/boot_linux: fix typo on cloudinit error message Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method Philippe Mathieu-Daudé
2021-02-08 13:37 ` Philippe Mathieu-Daudé [this message]
2021-02-08 13:37 ` [PULL 13/18] tests/acceptance/virtiofs_submounts: do not ask for ssh key password Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 14/18] tests/acceptance/virtiofs_submounts: use a virtio-net device instead Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 16/18] tests/acceptance/virtiofs_submounts: required space between IP and port Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 17/18] Acceptance tests: clarify ssh connection failure reason Philippe Mathieu-Daudé
2021-02-08 13:37 ` [PULL 18/18] Acceptance Tests: remove unnecessary tag from documentation example Philippe Mathieu-Daudé
2021-02-08 20:06 ` [PULL 00/18] Integration testing patches for 2021-02-08 Peter Maydell
2021-02-08 20:21   ` Philippe Mathieu-Daudé
2021-02-09 10:04     ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210208133711.2596075-13-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).