Skip to content

Commit

Permalink
typo fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Ana Guerrero Lopez <[email protected]>
  • Loading branch information
ana committed Sep 3, 2021
1 parent a369b9b commit db35d6b
Show file tree
Hide file tree
Showing 229 changed files with 438 additions and 439 deletions.
2 changes: 1 addition & 1 deletion libguestfs/tests/guestfish_augeas.py
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ def test_aug_label(test, vm, params):

if aug_label_result.stdout.strip('\n') != 'root':
gf.close_session()
test.fail("aug-label return the wrong lable")
test.fail("aug-label return the wrong label")
gf.close_session()


Expand Down
18 changes: 9 additions & 9 deletions libguestfs/tests/guestfish_block_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_blockdev_set_get_ro_rw(test, vm, params):

try:
if gf_result != expect_result:
test.fail("Get the uncorrect status, test failed.")
test.fail("Get the incorrect status, test failed.")
finally:
gf.close_session()

Expand Down Expand Up @@ -166,7 +166,7 @@ def test_blockdev_getss(test, vm, params):
logging.debug("Size of %s is %d" % (pv_name, int(gf_result)))

if int(gf_result) < 512:
test.fail("Size of sectors is uncorrect")
test.fail("Size of sectors is incorrect")


def test_blockdev_getsize64(test, vm, params):
Expand Down Expand Up @@ -387,7 +387,7 @@ def test_max_disks(test, vm, params):
logging.debug("The maximum number of disks is %s" % max_disk)

if max_disk != '255':
test.fail("The maximum number of disks is uncorrect")
test.fail("The maximum number of disks is incorrect")


def test_nr_devices(test, vm, params):
Expand All @@ -411,7 +411,7 @@ def test_nr_devices(test, vm, params):
logging.debug("The number of device is %s" % device_num)

if device_num != '1':
test.fail("The number of device is uncorrect")
test.fail("The number of device is incorrect")


def test_list_partitions(test, vm, params):
Expand Down Expand Up @@ -444,7 +444,7 @@ def test_list_partitions(test, vm, params):
device_num = len(re.findall('\S+', devices))
if device_num != 1:
# add one disk with one partition as default
test.fail("The number of device is uncorrect")
test.fail("The number of device is incorrect")
elif params["partition_type"] == "lvm":
logging.debug("This does not return logical volumes. "
"For that you will need to call 'lvs'")
Expand Down Expand Up @@ -522,12 +522,12 @@ def test_disk_virtual_size(test, vm, params):
if params["image_format"] == "raw":
if result != disk_size and result != image_size:
gf.close_session()
test.fail("disk-virtual-size can't get uncorrect size")
test.fail("disk-virtual-size can't get incorrect size")
elif params["image_format"] == "qcow2":
# disk size of qcow format is not fixed
if result != image_size:
gf.close_session()
test.fail("disk-virtual-size can't get uncorrect size")
test.fail("disk-virtual-size can't get incorrect size")

gf.close_session()

Expand Down Expand Up @@ -932,7 +932,7 @@ def test_part_set_get_bootable(test, vm, params):
ret = gf.part_get_bootable(pv_name, 1).stdout.strip()
if ret != v:
gf.close_session()
test.fail("Get the uncorrect status")
test.fail("Get the incorrect status")

gf.close_session()

Expand Down Expand Up @@ -962,7 +962,7 @@ def test_part_set_get_mbr_id(test, vm, params):
ret = gf.part_get_mbr_id(pv_name, i).stdout.strip()
if ret != v:
gf.close_session()
test.fail("Get the uncorrect mbr id")
test.fail("Get the incorrect mbr id")

gf.close_session()

Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/guestfish_fs_attr_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def test_tune2fs(test, vm, params):

mount_point = params.get("mount_point")

# tune2fs: ajust
# tune2fs: adjust
newmaxmc, newmc, newgroup, newintervalbc, newreservebc,\
newuser, neweb = '3', '5', '1', '600', '600', '1', 'panic'
gf.tune2fs(mount_point, 'true', newmaxmc, newmc, neweb,
Expand Down
4 changes: 2 additions & 2 deletions libguestfs/tests/guestfish_lvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def test_lvm_canonical_lv_name(test, vm, params):

if result != real_name:
gf.close_session()
test.fail("Return name is uncorrect")
test.fail("Return name is incorrect")

gf.close_session()

Expand Down Expand Up @@ -388,7 +388,7 @@ def test_lvm_set_filter(test, vm, params):
gf.close_session()
test.fail("LV should be listed")

# set filter, lvm device should be hided
# set filter, lvm device should be hidden
gf.lvm_set_filter(lv_name)
lv_name = gf.lvs().stdout.strip()
if lv_name:
Expand Down
4 changes: 2 additions & 2 deletions libguestfs/tests/guestfish_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def test_fallocate(test, vm, params):
gf.close_session()
test.fail("File size is not correct")

# overwriteen a existed file
# overwritten a existed file
string = "Hello World"
gf.write("/exist", "Hello world")
gf.fallocate("/exist", 200)
Expand Down Expand Up @@ -349,7 +349,7 @@ def test_fallocate64(test, vm, params):
gf.close_session()
test.fail("File size is not correct")

# overwriteen a existed file
# overwritten a existed file
string = "Hello World"
gf.write("/exist", "Hello world")
gf.fallocate64("/exist", 200)
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/guestfs_block_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def test_blockdev_rw(test, vm, params):
logging.info("Get readonly status successfully.")

if getro_result.stdout.strip() == "true":
logging.info("Paritition %s is readonly already.", part_name)
logging.info("Partition %s is readonly already.", part_name)
else:
setro_result = gf.blockdev_setro(part_name)
logging.debug(setro_result)
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/guestfs_operated_disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def truncate_from_file(ref_file, new_file, resize=0):
def test_cloned_vm(test, vm, params):
"""
1) Clone a new vm with virt-clone
2) Use guestfish to set new vm's network(accroding mac)
2) Use guestfish to set new vm's network(according mac)
3) Start new vm to check its network
"""
new_vm_name = "%s_vtclone" % vm.name
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/guestfs_volume_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def test_create_volume(test, vm, params):
3) Format additional disk with part-add
4) Create a volume group
5) Create a volume in created volume group
6) Get volume infomation with lvxxx commands
6) Get volume information with lvxxx commands
7) Login vm to check whether volume is ok
"""
add_device = params.get("gf_additional_device", "/dev/vdb")
Expand Down
4 changes: 2 additions & 2 deletions libguestfs/tests/virt_file_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def test_virt_tar_out(test, vm, params):
writes, writeo = vt.write_file_with_guestmount(mountpoint, path, content,
cleanup=False)
if utils_misc.umount("", mountpoint, "") is False:
logging.error("Umount vm's filesytem failed.")
logging.error("Umount vm's filesystem failed.")

if writes is False:
test.fail("Write file to mounted filesystem failed.")
Expand Down Expand Up @@ -240,7 +240,7 @@ def test_virt_copy_out(test, vm, params):
writes, writeo = vt.write_file_with_guestmount(mountpoint, path, content,
cleanup=False)
if utils_misc.umount("", mountpoint, "") is False:
logging.error("Umount vm's filesytem failed.")
logging.error("Umount vm's filesystem failed.")

if writes is False:
test.fail("Write file to mounted filesystem failed.")
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/virt_part_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_unformatted_part(test, vm, params):
mountpoint = params.get("vt_mountpoint", "/mnt")
mounts, mounto = vt.guestmount(mountpoint, vm_ref)
if utils_misc.umount("", mountpoint, "") and mounts:
test.fail("Mount vm's filesytem successfully, "
test.fail("Mount vm's filesystem successfully, "
"but not expected.")
logging.info("Mount vm's filesystem failed as expected.")

Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/virt_sysprep.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def clean_clone_vm():
sysprep_action(vm_clone_name, test_image, sysprep_target,
sysprep_hostname)
if not result_confirm(new_vm):
test.fail("Test Falied!")
test.fail("Test Failed!")
finally:
clean_clone_vm()
if "resize_image" in dir():
Expand Down
6 changes: 3 additions & 3 deletions libguestfs/tests/virt_sysprep_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def result_confirm_host():
try:
prepare_action(session)
except Exception as detail:
test.cancel("Enviroment doesn't support this test:%s"
test.cancel("Environment doesn't support this test:%s"
% str(detail))
session.close()
vm.destroy(gracefully=False)
Expand Down Expand Up @@ -200,11 +200,11 @@ def result_confirm_host():
else:
session = vm.wait_for_login()
if result_confirm_vm(session):
test.fail("'%s' check falied in guest!"
test.fail("'%s' check failed in guest!"
% sysprep_opt)
else:
if result_confirm_host():
test.fail("'%s' check falied in host!"
test.fail("'%s' check failed in host!"
% sysprep_opt)
else:
try:
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/virt_volume_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def test_created_volume(test, vm, params):
test.fail("Get md5 value failed.")

if not utils_misc.umount("", mountpoint, ""):
test.fail("Unmount vm's filesytem failed.")
test.fail("Unmount vm's filesystem failed.")
logging.info("Unmount vm's filesystem successfully.")

attached_vm = vt.newvm
Expand Down
2 changes: 1 addition & 1 deletion libguestfs/tests/virt_win_reg.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def run(test, params, env):
if operation == "query":
output_in_guest = output.split()[-1].strip()
if not output_in_guest == output_virt_win_reg:
test.fail("Informations are not equal from "
test.fail("Information are not equal from "
"virt_win_reg and from cmd in guest.\n"
"virt_win_reg: %s\n"
"cmd_in_guest: %s" %
Expand Down
2 changes: 1 addition & 1 deletion libvirt/cfg/build.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ variants:

installers = git_repo_libvirt

# Choose wether you want to include debug information/symbols
# Choose whether you want to include debug information/symbols
install_debug_info = yes

start_vm = no
Expand Down
2 changes: 1 addition & 1 deletion libvirt/tests/cfg/migration/sriov_migrate.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
cmd_during_mig = ""
enable_hostdev_device = "yes"
func_supported_since_libvirt_ver = (7, 0, 0)
unspported_err_msg = "This libvirt version doesn't support teaming element in plain hostdev elment."
unspported_err_msg = "This libvirt version doesn't support teaming element in plain hostdev element."
hostdev_device_teaming_dict = {'type': 'transient', 'persistent': 'ua-backup0'}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Please enter the ip what is used by the device
# you are going to attach to guest.
libvirt_pci_net_ip = "ENTER.YOUR.IP"
# Please enter a vailable ip from the net device.
# Please enter a available ip from the net device.
# We need to ping it after attaching pci device
# to guest to verify this device works well in guest.
libvirt_pci_server_ip = "ENTER.YOUR.SERVER.IP"
Expand Down
4 changes: 2 additions & 2 deletions libvirt/tests/cfg/remote_access/remote_with_ssh.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down Expand Up @@ -140,7 +140,7 @@
config_ipv6 = "yes"
ip_addr_suffix = 64
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
server_ifname = "ENTER.YOUR.SERVER.IFACE.NAME"
Expand Down
8 changes: 4 additions & 4 deletions libvirt/tests/cfg/remote_access/remote_with_tcp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand All @@ -58,7 +58,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand All @@ -70,7 +70,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down Expand Up @@ -106,7 +106,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down
8 changes: 4 additions & 4 deletions libvirt/tests/cfg/remote_access/remote_with_tls.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down Expand Up @@ -84,7 +84,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand All @@ -99,7 +99,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down Expand Up @@ -170,7 +170,7 @@
ip_addr_suffix = 64
# e.g. ipv6_addr_src = "3fef::101", ipv6_addr_des = "3fef::102"
ipv6_addr_src = "ENTER.YOUR.IPv6.SOURCE"
ipv6_addr_des = "ENTER.YOUR.IPv6.TRAGET"
ipv6_addr_des = "ENTER.YOUR.IPv6.TARGET"
# change your network interface name, e.g. eth0, enp0s25
client_ifname = "ENTER.YOUR.CLIENT.IFACE.NAME"
client_ipv6_addr = "${ipv6_addr_src}/${ip_addr_suffix}"
Expand Down
4 changes: 2 additions & 2 deletions libvirt/tests/cfg/sriov/sriov_net_failover.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
variants test_case:
- hotplug_hostdev_device_with_teaming:
func_supported_since_libvirt_ver = (7, 0, 0)
unspported_err_msg = "This libvirt version doesn't support to set teaming element in plain hostdev elment."
unspported_err_msg = "This libvirt version doesn't support to set teaming element in plain hostdev element."
hostdev_device_teaming_dict = {'type': 'transient', 'persistent': 'ua-backup0'}
- hotplug_hostdev_iface_with_teaming:
func_supported_since_libvirt_ver = (6, 0, 0)
Expand All @@ -19,7 +19,7 @@
net_hostdev_fwd = '{"mode": "hostdev", "managed": "yes"}'
- save_restore_hostdev_device_with_teaming:
func_supported_since_libvirt_ver = (7, 0, 0)
unspported_err_msg = "This libvirt version doesn't support to set teaming element in plain hostdev elment."
unspported_err_msg = "This libvirt version doesn't support to set teaming element in plain hostdev element."
hostdev_device_teaming_dict = {'type': 'transient', 'persistent': 'ua-backup0'}
- save_restore_hostdev_iface_with_teaming:
func_supported_since_libvirt_ver = (6, 0, 0)
Expand Down
2 changes: 1 addition & 1 deletion libvirt/tests/cfg/svirt/svirt_attach_disk.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
no sec_relabel_no..img_label_virt_content, virt_use_nfs_off
- negative_test:
# only when seclabel of VM is not relabeled and
# img is labeld with "system_u:object_r:virt_content_t:s0",
# img is labelled with "system_u:object_r:virt_content_t:s0",
# VM will not be able to access image.
status_error = yes
only sec_relabel_no..img_label_virt_content, virt_use_nfs_off
2 changes: 1 addition & 1 deletion libvirt/tests/cfg/svirt/svirt_start_destroy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
no multi_model.with_qemu_conf.unconfined, multi_model.without_qemu_conf
- negative_test:
# only when seclabel of VM is not relabeled and
# img is labeld with "system_u:object_r:virt_content_t:s0",
# img is labelled with "system_u:object_r:virt_content_t:s0",
# VM will not be able to access image.
status_error = yes
no relabel_no..st_dynamic, legit, mess_MCS, mess_u_r
Expand Down
2 changes: 1 addition & 1 deletion libvirt/tests/cfg/svirt/svirt_undefine_define.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
no sec_relabel_no..disk_label_virt_content
- negative_test:
# only when seclabel of VM is not relabeled and
# img is labeld with "system_u:object_r:virt_content_t:s0",
# img is labelled with "system_u:object_r:virt_content_t:s0",
# VM will not be able to access image.
status_error = yes
only sec_relabel_no..disk_label_virt_content
Loading

0 comments on commit db35d6b

Please sign in to comment.