From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Robert Foley" <robert.foley@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Peter Puhov" <peter.puhov@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 09/41] tests/vm: change scripts to use self._config
Date: Tue, 7 Jul 2020 08:08:26 +0100 [thread overview]
Message-ID: <20200707070858.6622-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200707070858.6622-1-alex.bennee@linaro.org>
From: Robert Foley <robert.foley@linaro.org>
This change converts existing scripts to using for example self.ROOT_PASS,
to self._config['root_pass'].
We made similar changes for GUEST_USER, and GUEST_PASS.
This allows us also to remove the change in basevm.py,
which adds __getattr__ for backwards compatibility.
Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200601211421.1277-8-robert.foley@linaro.org>
Message-Id: <20200701135652.1366-12-alex.bennee@linaro.org>
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 5fd66f6b26a1..f716798b405e 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -183,13 +183,6 @@ class BaseVM(object):
self.console_init(timeout=timeout)
self.console_wait(wait_string)
- def __getattr__(self, name):
- # Support direct access to config by key.
- # for example, access self._config['cpu'] by self.cpu
- if name.lower() in self._config.keys():
- return self._config[name.lower()]
- return object.__getattribute__(self, name)
-
def _download_with_cache(self, url, sha256sum=None, sha512sum=None):
def check_sha256sum(fname):
if not sha256sum:
@@ -239,13 +232,13 @@ class BaseVM(object):
return r
def ssh(self, *cmd):
- return self._ssh_do(self.GUEST_USER, cmd, False)
+ return self._ssh_do(self._config["guest_user"], cmd, False)
def ssh_root(self, *cmd):
return self._ssh_do("root", cmd, False)
def ssh_check(self, *cmd):
- self._ssh_do(self.GUEST_USER, cmd, True)
+ self._ssh_do(self._config["guest_user"], cmd, True)
def ssh_root_check(self, *cmd):
self._ssh_do("root", cmd, True)
diff --git a/tests/vm/fedora b/tests/vm/fedora
index a9195670f4bd..b2b478fdbcac 100755
--- a/tests/vm/fedora
+++ b/tests/vm/fedora
@@ -108,20 +108,20 @@ class FedoraVM(basevm.BaseVM):
self.console_wait_send("7) [!] Root password", "7\n")
self.console_wait("Password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait("Password (confirm):")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait_send("8) [ ] User creation", "8\n")
self.console_wait_send("1) [ ] Create user", "1\n")
self.console_wait_send("3) User name", "3\n")
- self.console_wait_send("ENTER:", "%s\n" % self.GUEST_USER)
+ self.console_wait_send("ENTER:", "%s\n" % self._config["guest_user"])
self.console_wait_send("4) [ ] Use password", "4\n")
self.console_wait_send("5) Password", "5\n")
self.console_wait("Password:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("Password (confirm):")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait_send("7) Groups", "c\n")
while True:
@@ -139,7 +139,7 @@ class FedoraVM(basevm.BaseVM):
if good:
break
time.sleep(10)
- self.console_send("r\n" % self.GUEST_PASS)
+ self.console_send("r\n" % self._config["guest_pass"])
self.console_wait_send("'b' to begin install", "b\n")
@@ -150,12 +150,13 @@ class FedoraVM(basevm.BaseVM):
# setup qemu user
prompt = " ~]$"
- self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS)
+ self.console_ssh_init(prompt, self._config["guest_user"],
+ self._config["guest_pass"])
self.console_wait_send(prompt, "exit\n")
# setup root user
prompt = " ~]#"
- self.console_ssh_init(prompt, "root", self.ROOT_PASS)
+ self.console_ssh_init(prompt, "root", self._config["root_pass"])
self.console_sshd_config(prompt)
# setup virtio-blk #1 (tarfile)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index f87db2b126e6..29252fa4a64a 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -113,9 +113,9 @@ class FreeBSDVM(basevm.BaseVM):
# post-install configuration
self.console_wait("New Password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait("Retype New Password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait_send("Network Configuration", "\n")
self.console_wait_send("IPv4", "y")
@@ -134,9 +134,9 @@ class FreeBSDVM(basevm.BaseVM):
# qemu user
self.console_wait_send("Add User Accounts", "y")
self.console_wait("Username")
- self.console_send("%s\n" % self.GUEST_USER)
+ self.console_send("%s\n" % self._config["guest_user"])
self.console_wait("Full name")
- self.console_send("%s\n" % self.GUEST_USER)
+ self.console_send("%s\n" % self._config["guest_user"])
self.console_wait_send("Uid", "\n")
self.console_wait_send("Login group", "\n")
self.console_wait_send("Login group", "\n")
@@ -148,9 +148,9 @@ class FreeBSDVM(basevm.BaseVM):
self.console_wait_send("Use an empty password", "\n")
self.console_wait_send("Use a random password", "\n")
self.console_wait("Enter password:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("Enter password again:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait_send("Lock out", "\n")
self.console_wait_send("OK", "yes\n")
self.console_wait_send("Add another user", "no\n")
@@ -164,12 +164,12 @@ class FreeBSDVM(basevm.BaseVM):
# setup qemu user
prompt = "$"
- self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS)
+ self.console_ssh_init(prompt, self._config["guest_user"], self._config["guest_pass"])
self.console_wait_send(prompt, "exit\n")
# setup root user
prompt = "root@freebsd:~ #"
- self.console_ssh_init(prompt, "root", self.ROOT_PASS)
+ self.console_ssh_init(prompt, "root", self._config["root_pass"])
self.console_sshd_config(prompt)
# setup serial console
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index cdac502dad86..dc0e45c1d45a 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -120,24 +120,24 @@ class NetBSDVM(basevm.BaseVM):
self.console_wait_send("d: Change root password", "d\n")
self.console_wait_send("a: Yes", "a\n")
self.console_wait("New password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait("New password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait("Retype new password:")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait_send("o: Add a user", "o\n")
self.console_wait("username")
- self.console_send("%s\n" % self.GUEST_USER)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("to group wheel")
self.console_wait_send("a: Yes", "a\n")
self.console_wait_send("a: /bin/sh", "a\n")
self.console_wait("New password:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("New password:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("Retype new password:")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait_send("a: Configure network", "a\n")
self.console_wait_send("a: vioif0", "a\n")
@@ -170,12 +170,13 @@ class NetBSDVM(basevm.BaseVM):
# setup qemu user
prompt = "localhost$"
- self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS)
+ self.console_ssh_init(prompt, self._config["guest_user"],
+ self._config["guest_pass"])
self.console_wait_send(prompt, "exit\n")
# setup root user
prompt = "localhost#"
- self.console_ssh_init(prompt, "root", self.ROOT_PASS)
+ self.console_ssh_init(prompt, "root", self._config["root_pass"])
self.console_sshd_config(prompt)
# setup virtio-blk #1 (tarfile)
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 13e7f9a6d56f..dfe633e45325 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -98,9 +98,9 @@ class OpenBSDVM(basevm.BaseVM):
self.console_wait_send("Which network interface", "done\n")
self.console_wait_send("DNS domain name", "localnet\n")
self.console_wait("Password for root account")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait("Password for root account")
- self.console_send("%s\n" % self.ROOT_PASS)
+ self.console_send("%s\n" % self._config["root_pass"])
self.console_wait_send("Start sshd(8)", "yes\n")
self.console_wait_send("X Window System", "\n")
self.console_wait_send("xenodm", "\n")
@@ -108,13 +108,13 @@ class OpenBSDVM(basevm.BaseVM):
self.console_wait_send("Which speed", "\n")
self.console_wait("Setup a user")
- self.console_send("%s\n" % self.GUEST_USER)
+ self.console_send("%s\n" % self._config["guest_user"])
self.console_wait("Full name")
- self.console_send("%s\n" % self.GUEST_USER)
+ self.console_send("%s\n" % self._config["guest_user"])
self.console_wait("Password")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait("Password")
- self.console_send("%s\n" % self.GUEST_PASS)
+ self.console_send("%s\n" % self._config["guest_pass"])
self.console_wait_send("Allow root ssh login", "yes\n")
self.console_wait_send("timezone", "UTC\n")
@@ -135,12 +135,13 @@ class OpenBSDVM(basevm.BaseVM):
# setup qemu user
prompt = "$"
- self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS)
+ self.console_ssh_init(prompt, self._config["guest_user"],
+ self._config["guest_pass"])
self.console_wait_send(prompt, "exit\n")
# setup root user
prompt = "openbsd#"
- self.console_ssh_init(prompt, "root", self.ROOT_PASS)
+ self.console_ssh_init(prompt, "root", self._config["root_pass"])
self.console_sshd_config(prompt)
# setup virtio-blk #1 (tarfile)
--
2.20.1
next prev parent reply other threads:[~2020-07-07 7:16 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 7:08 [PULL 00/41] testing updates (vm, gitlab, misc build fixes) Alex Bennée
2020-07-07 7:08 ` [PULL 01/41] crypto/linux_keyring: fix 'secret_keyring' configure test Alex Bennée
2020-07-07 7:08 ` [PULL 02/41] util/coroutine: Cleanup start_switch_fiber_ for TSAN Alex Bennée
2020-07-07 7:08 ` [PULL 03/41] tests/vm: pass args through to BaseVM's __init__ Alex Bennée
2020-07-07 7:08 ` [PULL 04/41] tests/vm: Add configuration to basevm.py Alex Bennée
2020-07-10 13:50 ` Alex Bennée
2020-07-07 7:08 ` [PULL 05/41] tests/vm: Added configuration file support Alex Bennée
2020-07-07 7:08 ` [PULL 06/41] tests/vm: Add common Ubuntu python module Alex Bennée
2020-07-07 7:08 ` [PULL 07/41] tests/vm: Added a new script for ubuntu.aarch64 Alex Bennée
2020-07-07 7:08 ` [PULL 08/41] tests/vm: Added a new script for centos.aarch64 Alex Bennée
2020-07-07 7:08 ` Alex Bennée [this message]
2020-07-07 7:08 ` [PULL 10/41] python/qemu: Add ConsoleSocket for optional use in QEMUMachine Alex Bennée
2020-07-10 19:20 ` John Snow
2020-07-11 16:15 ` Robert Foley
2020-07-11 17:45 ` Alex Bennée
2020-07-13 13:57 ` John Snow
2020-07-13 14:16 ` Philippe Mathieu-Daudé
2020-07-13 14:37 ` Eduardo Habkost
2020-07-07 7:08 ` [PULL 11/41] tests/vm: Add workaround to consume console Alex Bennée
2020-07-07 7:08 ` [PULL 12/41] tests/vm: switch from optsparse to argparse Alex Bennée
2020-07-07 7:08 ` [PULL 13/41] tests/vm: allow us to take advantage of MTTCG Alex Bennée
2020-07-07 7:08 ` [PULL 14/41] tests/docker: check for an parameters not empty string Alex Bennée
2020-07-07 7:08 ` [PULL 15/41] tests/docker: change tag naming scheme of our images Alex Bennée
2020-07-07 7:08 ` [PULL 16/41] .gitignore: un-ignore .gitlab-ci.d Alex Bennée
2020-07-07 7:08 ` [PULL 17/41] gitlab-ci: Fix the change rules after moving the YML files Alex Bennée
2020-07-07 7:08 ` [PULL 18/41] gitlab: introduce explicit "container" and "build" stages Alex Bennée
2020-07-07 7:08 ` [PULL 19/41] gitlab: build all container images during CI Alex Bennée
2020-07-07 7:08 ` [PULL 20/41] gitlab: convert jobs to use custom built containers Alex Bennée
2020-07-07 7:08 ` [PULL 21/41] gitlab: build containers with buildkit and metadata Alex Bennée
2020-07-07 7:08 ` [PULL 22/41] tests/docker: add --registry support to tooling Alex Bennée
2020-07-07 7:08 ` [PULL 23/41] tests/docker: add packages needed for check-acceptance Alex Bennée
2020-07-07 7:08 ` [PULL 24/41] tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab Alex Bennée
2020-07-07 7:08 ` [PULL 25/41] tests/acceptance: fix dtb path for machine_rx_gdbsim Alex Bennée
2020-07-07 7:08 ` [PULL 26/41] tests/acceptance: skip multicore mips_malta tests on GitLab Alex Bennée
2020-07-07 7:08 ` [PULL 27/41] tests/acceptance: skip LinuxInitrd 2gib with v4.16 " Alex Bennée
2020-07-07 7:08 ` [PULL 28/41] gitlab: add acceptance testing to system builds Alex Bennée
2020-09-08 19:54 ` Philippe Mathieu-Daudé
2020-09-09 6:03 ` Thomas Huth
2020-07-07 7:08 ` [PULL 29/41] tests/tcg: add more default compilers to configure.sh Alex Bennée
2020-07-07 7:08 ` [PULL 30/41] tests/docker: add a linux-user testing focused image Alex Bennée
2020-07-07 7:08 ` [PULL 31/41] linux-user/elfload: use MAP_FIXED_NOREPLACE in pgb_reserved_va Alex Bennée
2020-07-07 7:08 ` [PULL 32/41] gitlab: enable check-tcg for linux-user tests Alex Bennée
2020-07-07 7:08 ` [PULL 33/41] gitlab: add avocado asset caching Alex Bennée
2020-07-07 7:08 ` [PULL 34/41] gitlab: split build-disabled into two phases Alex Bennée
2020-07-07 7:08 ` [PULL 35/41] gitlab: limit re-builds of the containers Alex Bennée
2020-07-07 7:08 ` [PULL 36/41] containers.yml: build with docker.py tooling Alex Bennée
2020-07-07 7:08 ` [PULL 37/41] testing: add check-build target Alex Bennée
2020-07-07 7:08 ` [PULL 38/41] shippable: pull images from registry instead of building Alex Bennée
2020-07-07 7:08 ` [PULL 39/41] travis.yml: Test also the other targets on s390x Alex Bennée
2020-07-07 7:08 ` [PULL 40/41] tests/qht-bench: Adjust testing rate by -1 Alex Bennée
2020-07-07 7:08 ` [PULL 41/41] tests/qht-bench: Adjust threshold computation Alex Bennée
2020-07-07 9:39 ` [PULL 00/41] testing updates (vm, gitlab, misc build fixes) Alex Bennée
2020-07-09 11:31 ` Peter Maydell
2020-07-09 12:24 ` Philippe Mathieu-Daudé
2020-07-09 13:04 ` Peter Maydell
2020-07-09 15:46 ` Alex Bennée
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=20200707070858.6622-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=peter.puhov@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=robert.foley@linaro.org \
/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).