| Message ID | 20210203172357.1422425-5-crosa@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Acceptance Test: introduce base class for Linux based tests | expand |
Cleber Rosa <crosa@redhat.com> writes: > 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. > > Reference: https://avocado-framework.readthedocs.io/en/84.0/api/test/avocado.html#avocado.Test.workdir > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
On Wed, Feb 03, 2021 at 12:23:39PM -0500, Cleber Rosa wrote: > 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. > > Reference: https://avocado-framework.readthedocs.io/en/84.0/api/test/avocado.html#avocado.Test.workdir > Signed-off-by: Cleber Rosa <crosa@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 361e5990b6..68d3cd6869 100644 > --- a/tests/acceptance/virtiofs_submounts.py > +++ b/tests/acceptance/virtiofs_submounts.py > @@ -136,8 +136,7 @@ class VirtiofsSubmountsTest(BootLinux): > 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 @@ class VirtiofsSubmountsTest(BootLinux): > > 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.25.4 > Reviewed-by: Beraldo Leal <bleal@redhat.com>
diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virtiofs_submounts.py index 361e5990b6..68d3cd6869 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -136,8 +136,7 @@ class VirtiofsSubmountsTest(BootLinux): 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 @@ class VirtiofsSubmountsTest(BootLinux): 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))
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. Reference: https://avocado-framework.readthedocs.io/en/84.0/api/test/avocado.html#avocado.Test.workdir Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/acceptance/virtiofs_submounts.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)