RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa: allow keeping sudo in command arguments

Browse Source 
sudo cannot be omitted from the given command's arguments, when running
passwd, chown and, specially, when sudo is used for running the given
command as different user.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Rishabh Dave 2019-02-20 22:06:41 +05:30
parent 5df2b82c4f
commit 3e0a1361f7
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qa/tasks/cephfs/mount.py
View File

@ -155,11 +155,12 @@ class CephFSMount(object):
p.wait()
return p.stdout.getvalue().strip()
def run_shell(self, args, wait=True, check_status=True):
def run_shell(self, args, wait=True, check_status=True, omit_sudo=True):
args = ["cd", self.mountpoint, run.Raw('&&'), "sudo"] + args
return self.client_remote.run(args=args, stdout=StringIO(),
stderr=StringIO(), wait=wait,
check_status=check_status)
check_status=check_status,
omit_sudo=omit_sudo)
def open_no_data(self, basename):
"""

15
qa/tasks/vstart_runner.py
View File

@ -236,10 +236,16 @@ class LocalRemote(object):
def run(self, args, check_status=True, wait=True,
stdout=None, stderr=None, cwd=None, stdin=None,
logger=None, label=None, env=None, timeout=None):
logger=None, label=None, env=None, timeout=None, omit_sudo=True):
try:
if args[args.index('sudo') + 1] in ['-u', 'passwd', 'chown']:
omit_sudo = False
except ValueError:
pass
# We don't need no stinkin' sudo
args = [a for a in args if a != "sudo"]
if omit_sudo:
args = [a for a in args if a != "sudo"]
# We have to use shell=True if any run.Raw was present, e.g. &&
shell = any([a for a in args if isinstance(a, Raw)])
@ -418,12 +424,13 @@ class LocalFuseMount(FuseMount):
# to avoid assumptions about daemons' pwd
return os.path.abspath("./client.{0}.keyring".format(self.client_id))
def run_shell(self, args, wait=True, check_status=True):
def run_shell(self, args, wait=True, check_status=True, omit_sudo=True):
# FIXME maybe should add a pwd arg to teuthology.orchestra so that
# the "cd foo && bar" shenanigans isn't needed to begin with and
# then we wouldn't have to special case this
return self.client_remote.run(args, wait=wait, cwd=self.mountpoint,
check_status=check_status)
check_status=check_status,
omit_sudo=omit_sudo)
def setupfs(self, name=None):
if name is None and self.fs is not None: