Skip to content

Fixing issues in running host test in guest #4319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
narasimhan-v wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing issues in running host test in guest #4319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions virttest/utils_test/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,7 @@ def __init__(
testlist=[],
timeout=3600,
testrepo="https://github.com/avocado-framework-tests/avocado-misc-tests.git",
testbranch="master",
installtype="pip",
avocado_vt=False,
reinstall=False,
Expand All @@ -1037,6 +1038,7 @@ def __init__(
:param testlist: testlist as list of tuples like (testcase, muxfile)
:param timeout: test timeout
:param testrepo: test repository default is avocado-misc-tests
:param testbranch: test repo branch, default is master
:param installtype: how to install avocado, supported types
pip, package, git
:param reinstall: flag to reinstall in case of avocado present inside guest
Expand All @@ -1050,6 +1052,7 @@ def __init__(
self.testlist = testlist
self.timeout = timeout
self.test_repo = testrepo
self.test_branch = testbranch
self.installtype = installtype
self.avocado_vt = avocado_vt
self.reinstall = reinstall
Expand Down Expand Up @@ -1126,11 +1129,16 @@ def env_check(self):
LOG.error("Unable to find python.")
return False
self.pip_bin = find_bin(self.session, ["pip3", "pip2", "pip"])
if self.pip_bin:
cmd = "%s install --upgrade pip;" % (self.pip_bin)
if self.session.cmd_status(cmd, timeout=self.timeout) != 0:
LOG.error("Unable to upgrade pip.")
return False
# Ideally --break-system-packages parameter should work with pip
# in case of venv, but fails. So, not going through this in cases
# where installtype is not pip.
if self.installtype == "pip":
self.pip_bin = find_bin(self.session, ["pip3", "pip2", "pip"])
if self.pip_bin:
cmd = "%s install --upgrade pip;" % (self.pip_bin)
if self.session.cmd_status(cmd, timeout=self.timeout) != 0:
LOG.error("Unable to upgrade pip.")
return False
Comment thread
coderabbitai[bot] marked this conversation as resolved.
if not utils_misc.make_dirs(self.test_path, session=self.session):
LOG.error("Failed to create test path in guest")
return False
Expand Down Expand Up @@ -1254,7 +1262,7 @@ def runtest(self):
if status != 0:
raise exceptions.TestError("Downloading test failed: %s" % output)
else:
if not self.git_install(self.test_repo, install=False):
if not self.git_install(self.test_repo, branch=self.test_branch, install=False):
raise exceptions.TestError("Downloading test failed")

LOG.debug("Running Test")
Expand Down