aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2020-03-23 16:15:08 +0000
committerAlex Bennée <alex.bennee@linaro.org>2020-03-27 13:43:20 +0000
commitf01454ad17e3dcede67625e846cfbbd603e768e8 (patch)
tree06e09d13c5d70cbe202223e24a0b0947b152e1a6 /tests
parent2cc3e591b3321aa44ea09527ae1e4d443615d2c7 (diff)
tests/vm: fix basevm config
When the patch was merged it was part of a longer series which had already merged the config changes. Semu-revert the config related changes for now so things will build. Fixes: b081986c85fd2 Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200323161514.23952-6-alex.bennee@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/vm/basevm.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index cffe7c4600..756ccf7aca 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -358,23 +358,23 @@ class BaseVM(object):
"local-hostname: {}-guest\n".format(name)])
mdata.close()
udata = open(os.path.join(cidir, "user-data"), "w")
- print("guest user:pw {}:{}".format(self._config['guest_user'],
- self._config['guest_pass']))
+ print("guest user:pw {}:{}".format(self.GUEST_USER,
+ self.GUEST_PASS))
udata.writelines(["#cloud-config\n",
"chpasswd:\n",
" list: |\n",
- " root:%s\n" % self._config['root_pass'],
- " %s:%s\n" % (self._config['guest_user'],
- self._config['guest_pass']),
+ " root:%s\n" % self.ROOT_PASS,
+ " %s:%s\n" % (self.GUEST_USER,
+ self.GUEST_PASS),
" expire: False\n",
"users:\n",
- " - name: %s\n" % self._config['guest_user'],
+ " - name: %s\n" % self.GUEST_USER,
" sudo: ALL=(ALL) NOPASSWD:ALL\n",
" ssh-authorized-keys:\n",
- " - %s\n" % self._config['ssh_pub_key'],
+ " - %s\n" % SSH_PUB_KEY,
" - name: root\n",
" ssh-authorized-keys:\n",
- " - %s\n" % self._config['ssh_pub_key'],
+ " - %s\n" % SSH_PUB_KEY,
"locale: en_US.UTF-8\n"])
proxy = os.environ.get("http_proxy")
if not proxy is None: