openstack
/
tempest
Code Issues Proposed changes

Merge "mke2fs: do not use full path"

This commit is contained in:
Zuul 2019-08-29 20:37:07 +00:00 committed by Gerrit Code Review
parent d5b073c12e 6a7472aa8b
commit 22702048ae
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/common/utils/linux/remote_client.py
View File

@ -148,7 +148,7 @@ class RemoteClient(remote_client.RemoteClient):
self.exec_command('sudo umount %s' % mount_path)
def make_fs(self, dev_name, fs='ext4'):
cmd_mkfs = 'sudo /usr/sbin/mke2fs -t %s /dev/%s' % (fs, dev_name)
cmd_mkfs = 'sudo mke2fs -t %s /dev/%s' % (fs, dev_name)
try:
self.exec_command(cmd_mkfs)
except tempest.lib.exceptions.SSHExecCommandFailed:

2
tempest/config.py
View File

@ -811,7 +811,7 @@ ValidationGroup = [
default="password",
help="Password used to authenticate to an instance."),
cfg.StrOpt('ssh_shell_prologue',
default="set -eu -o pipefail; PATH=$$PATH:/sbin;",
default="set -eu -o pipefail; PATH=$$PATH:/sbin:/usr/sbin;",
help="Shell fragments to use before executing a command "
"when sshing to a guest."),
cfg.IntOpt('ping_size',

2
tempest/tests/common/utils/linux/test_remote_client.py
View File

@ -88,7 +88,7 @@ class TestRemoteClient(base.TestCase):
# the information using gnu/linux tools.
def _assert_exec_called_with(self, cmd):
cmd = "set -eu -o pipefail; PATH=$PATH:/sbin; " + cmd
cmd = "set -eu -o pipefail; PATH=$PATH:/sbin:/usr/sbin; " + cmd
self.ssh_mock.mock.exec_command.assert_called_with(cmd)
def test_get_disks(self):