Skip to content

Commit

Permalink
tests/: spelling fixes
Browse files Browse the repository at this point in the history
with some rewording in
 tests/qemu-iotests/298
 tests/qtest/fuzz/generic_fuzz.c
 tests/unit/test-throttle.c
as suggested by Eric.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
Michael Tokarev committed Sep 8, 2023
1 parent d30b5bc commit 96420a3
Show file tree
Hide file tree
Showing 49 changed files with 69 additions and 69 deletions.
4 changes: 2 additions & 2 deletions tests/avocado/acpi-bits.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# group: rw quick
# Exercize QEMU generated ACPI/SMBIOS tables using biosbits,
# Exercise QEMU generated ACPI/SMBIOS tables using biosbits,
# https://biosbits.org/
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -366,7 +366,7 @@ def tearDown(self):
super().tearDown()

def test_acpi_smbios_bits(self):
"""The main test case implementaion."""
"""The main test case implementation."""

iso_file = os.path.join(self._workDir,
'bits-%d.iso' %self._bitsInternalVer)
Expand Down
4 changes: 2 additions & 2 deletions tests/avocado/acpi-bits/bits-tests/testacpi.py2
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ def test_rsdp():

# Checksum the first 20 bytes per ACPI 1.0
csum = sum(ord(c) for c in data[:20]) % 0x100
testsuite.test('ACPI 1.0 table first 20 bytes cummulative checksum must equal 0', csum == 0)
testsuite.print_detail("Cummulative checksum = {} (Expected 0)".format(csum))
testsuite.test('ACPI 1.0 table first 20 bytes cumulative checksum must equal 0', csum == 0)
testsuite.print_detail("Cumulative checksum = {} (Expected 0)".format(csum))

test_table_checksum(data)
rsdp = acpi.parse_rsdp()
Expand Down
2 changes: 1 addition & 1 deletion tests/decode/err_pattern_group_ident2.decode
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
{
top 00000000 00000000 00000000 00000000
sub1 00000000 00000000 00000000 ........ %sub1
# comments are suposed to be indented
# comments are supposed to be indented
}
2 changes: 1 addition & 1 deletion tests/docker/common.rc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# the top-level directory.

# This might be set by ENV of a docker container... it is always
# overriden by TARGET_LIST if the user sets it. We special case
# overridden by TARGET_LIST if the user sets it. We special case
# "none" to allow for other options like --disable-tcg to restrict the
# builds we eventually do.
if test "$DEF_TARGET_LIST" = "none"; then
Expand Down
2 changes: 1 addition & 1 deletion tests/migration/guestperf-batch.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Migration test batch comparison invokation
# Migration test batch comparison invocation
#
# Copyright (c) 2016 Red Hat, Inc.
#
Expand Down
2 changes: 1 addition & 1 deletion tests/migration/guestperf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Migration test direct invokation command
# Migration test direct invocation command
#
# Copyright (c) 2016 Red Hat, Inc.
#
Expand Down
2 changes: 1 addition & 1 deletion tests/plugin/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
} else if (g_strcmp0(tokens[1], "rw") == 0) {
rw = QEMU_PLUGIN_MEM_RW;
} else {
fprintf(stderr, "invaild value for argument track: %s\n", opt);
fprintf(stderr, "invalid value for argument track: %s\n", opt);
return -1;
}
} else if (g_strcmp0(tokens[0], "inline") == 0) {
Expand Down
2 changes: 1 addition & 1 deletion tests/qapi-schema/bad-if-not.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# check 'if not' with empy argument
# check 'if not' with empty argument
{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },
'if': { 'not': '' } }
2 changes: 1 addition & 1 deletion tests/qemu-iotests/029
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
. ./common.pattern

# Any format supporting intenal snapshots
# Any format supporting internal snapshots
_supported_fmt qcow2
_supported_proto generic
# Internal snapshots are (currently) impossible with refcount_bits=1,
Expand Down
8 changes: 4 additions & 4 deletions tests/qemu-iotests/040
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
self.assertIsNone(self.vm.node_info('cow-2'))
self.assertIsNotNone(self.vm.node_info('cow-1'))

# 2 has been comitted into 1
# 2 has been committed into 1
self.pattern_files[2] = self.img1

def test_commit_through_filter(self):
Expand All @@ -863,7 +863,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
self.assertIsNone(self.vm.node_info('bottom-filter'))
self.assertIsNotNone(self.vm.node_info('cow-0'))

# 1 has been comitted into 0
# 1 has been committed into 0
self.pattern_files[1] = self.img0

def test_filtered_active_commit_with_filter(self):
Expand Down Expand Up @@ -900,7 +900,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
drv0 = next(dev for dev in blockdevs if dev['qdev'] == 'drv0')
self.assertEqual(drv0['inserted']['node-name'], 'cow-2')

# 3 has been comitted into 2
# 3 has been committed into 2
self.pattern_files[3] = self.img2

def test_filtered_active_commit_without_filter(self):
Expand All @@ -916,7 +916,7 @@ class TestCommitWithFilters(iotests.QMPTestCase):
self.assertIsNone(self.vm.node_info('cow-3'))
self.assertIsNotNone(self.vm.node_info('cow-2'))

# 3 has been comitted into 2
# 3 has been committed into 2
self.pattern_files[3] = self.img2

class TestCommitWithOverriddenBacking(iotests.QMPTestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/046
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ aio_flush
EOF

# Sequential write, but the next cluster is already allocated
# and phyiscally in the right position
# and physically in the right position
cat <<EOF
write -P 89 0x80000 0x1000
write -P 90 0x96000 0x8000
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/059
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ done
echo
echo "=== Testing afl image with a very large capacity ==="
_use_sample_img afl9.vmdk.bz2
_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficent memory, skipped test"
_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficient memory, skipped test"
_img_info
_cleanup_test_img

Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/061
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ _supported_os Linux
# we have explicit tests for various cluster sizes, the remaining tests
# require the default 64k cluster
# we don't have explicit tests for zstd qcow2 compression type, as zstd may be
# not compiled in. And we can't create compat images with comression type
# not compiled in. And we can't create compat images with compression type
# extension
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file \
cluster_size compression_type
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/071
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ _supported_fmt qcow2
_supported_proto file fuse
_require_drivers blkdebug blkverify
# blkdebug can only inject errors on bs->file, not on the data_file,
# so thie test does not work with external data files
# so this test does not work with external data files
_unsupported_imgopts data_file

do_run_qemu()
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/197
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ output=$($QEMU_IO -f qcow2 -C -c "read -P 0 1k $((2*1024*1024*1024 - 512))" \
"$TEST_WRAP" 2>&1 | _filter_qemu_io)
case $output in
*allocate*)
_notrun "Insufficent memory to run test" ;;
_notrun "Insufficient memory to run test" ;;
*) printf '%s\n' "$output" ;;
esac
$QEMU_IO -f qcow2 -C -c "read -P 0 $((3*1024*1024*1024 + 1024)) 1k" \
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/215
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ output=$($QEMU_IO \
2>&1 | _filter_qemu_io)
case $output in
*allocate*)
_notrun "Insufficent memory to run test" ;;
_notrun "Insufficient memory to run test" ;;
*) printf '%s\n' "$output" ;;
esac
$QEMU_IO \
Expand Down
4 changes: 2 additions & 2 deletions tests/qemu-iotests/298
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ class TestTruncate(iotests.QMPTestCase):
stat = os.stat(disk)
refstat = os.stat(refdisk)

# Probably we'll want preallocate filter to keep align to cluster when
# shrink preallocation, so, ignore small differece
# The preallocate filter may keep cluster alignment when shrinking,
# so ignore small differences
self.assertLess(abs(stat.st_size - refstat.st_size), 64 * 1024)

# Preallocate filter may leak some internal clusters (for example, if
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ disable=invalid-name,
too-many-public-methods,
# pylint warns about Optional[] etc. as unsubscriptable in 3.9
unsubscriptable-object,
# pylint's static analysis causes false positivies for file_path();
# pylint's static analysis causes false positives for file_path();
# If we really care to make it statically knowable, we'll use mypy.
unbalanced-tuple-unpacking,
# Sometimes we need to disable a newly introduced pylint warning.
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/ahci-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ static void ahci_test_pci_spec(AHCIQState *ahci)
ASSERT_BIT_CLEAR(datal, ~0xFF);
g_assert_cmphex(datal, !=, 0);

/* Check specification adherence for capability extenstions. */
/* Check specification adherence for capability extensions. */
data = qpci_config_readw(ahci->dev, datal);

switch (ahci->fingerprint) {
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/bcm2835-dma-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#define BCM2708_DMA_INT_STATUS 0xfe0

/* DMA Trasfer Info fields: */
/* DMA Transfer Info fields: */
#define BCM2708_DMA_INT_EN (1 << 0)
#define BCM2708_DMA_D_INC (1 << 4)
#define BCM2708_DMA_S_INC (1 << 8)
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/bios-tables-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* 4. Run
* make check V=2
* this will produce a bunch of warnings about differences
* beween actual and expected ACPI tables. If you have IASL installed,
* between actual and expected ACPI tables. If you have IASL installed,
* they will also be disassembled so you can look at the disassembled
* output. If not - disassemble them yourself in any way you like.
* Look at the differences - make sure they make sense and match what the
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/ds1338-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc)

i2c_read_block(i2cdev, 0, resp, sizeof(resp));

/* check retrieved time againt local time */
/* check retrieved time against local time */
g_assert_cmpuint(bcd2bin(resp[4]), == , tm_ptr->tm_mday);
g_assert_cmpuint(bcd2bin(resp[5]), == , 1 + tm_ptr->tm_mon);
g_assert_cmpuint(2000 + bcd2bin(resp[6]), == , 1900 + tm_ptr->tm_year);
Expand Down
6 changes: 3 additions & 3 deletions tests/qtest/fuzz/generic_fuzz.c
Original file line number Diff line number Diff line change
Expand Up @@ -846,9 +846,9 @@ static void generic_pre_fuzz(QTestState *s)
* functionality B
*
* This function attempts to produce an input that:
* Ouptut: maps a device's BARs, set up three DMA patterns, triggers
* functionality A device, replaces the DMA patterns with a single
* patten, and triggers device functionality B.
* Output: maps a device's BARs, set up three DMA patterns, triggers
* device functionality A, replaces the DMA patterns with a single
* pattern, and triggers device functionality B.
*/
static size_t generic_fuzz_crossover(const uint8_t *data1, size_t size1, const
uint8_t *data2, size_t size2, uint8_t *out,
Expand Down
4 changes: 2 additions & 2 deletions tests/qtest/libqos/qgraph.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct QOSStackElement {
int length;
};

/* Each enty in these hash table will consist of <string, node/edge> pair. */
/* Each entry in these hash table will consist of <string, node/edge> pair. */
static GHashTable *edge_table;
static GHashTable *node_table;

Expand Down Expand Up @@ -214,7 +214,7 @@ static QOSGraphEdge *search_list_edges(QOSGraphEdgeList *edgelist,
/**
* search_machine(): search for a machine @name in the node hash
* table. A machine is the child of the root node.
* This function forces the research in the childs of the root,
* This function forces the research in the children of the root,
* to check the node is a proper machine
*
* Returns: on success: the %QOSGraphNode
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/libqos/qgraph_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ char *qos_graph_edge_get_name(QOSGraphEdge *edge);
* qos_graph_get_machine(): returns the machine assigned
* to that @node name.
*
* It performs a search only trough the list of machines
* It performs a search only through the list of machines
* (i.e. the QOS_ROOT child).
*
* Returns: on success: the %QOSGraphNode
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/libqos/virtio-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static void virtio_gpio_cleanup(QVhostUserGPIO *gpio)

/*
* This handles the VirtIO setup from the point of view of the driver
* frontend and therefor doesn't present any vhost specific features
* frontend and therefore doesn't present any vhost specific features
* and in fact masks of the re-used bit.
*/
static void virtio_gpio_setup(QVhostUserGPIO *gpio)
Expand Down
4 changes: 2 additions & 2 deletions tests/qtest/libqtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static int socket_accept(int sock)
socklen_t addrlen;
int ret;
/*
* timeout unit of blocking receive calls is different among platfoms.
* timeout unit of blocking receive calls is different among platforms.
* It's in seconds on non-Windows platforms but milliseconds on Windows.
*/
#ifndef _WIN32
Expand Down Expand Up @@ -1697,7 +1697,7 @@ QTestState *qtest_inproc_init(QTestState **s, bool log, const char* arch,

qtest_client_set_rx_handler(qts, qtest_client_inproc_recv_line);

/* send() may not have a matching protoype, so use a type-safe wrapper */
/* send() may not have a matching prototype, so use a type-safe wrapper */
qts->ops.external_send = send;
qtest_client_set_tx_handler(qts, send_wrapper);

Expand Down
6 changes: 3 additions & 3 deletions tests/qtest/migration-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ static void migrate_ensure_converge(QTestState *who)
* transferred.
*
* Finally we go back to the source and read a byte just
* before the marker untill we see it flip in value. This
* before the marker until we see it flip in value. This
* is proof that start_address -> MAGIC_OFFSET_BASE
* is now dirty again.
*
Expand Down Expand Up @@ -826,7 +826,7 @@ static int test_migrate_start(QTestState **from, QTestState **to,

/*
* Remove shmem file immediately to avoid memory leak in test failed case.
* It's valid becase QEMU has already opened this file
* It's valid because QEMU has already opened this file
*/
if (args->use_shmem) {
unlink(shmem_path);
Expand Down Expand Up @@ -2103,7 +2103,7 @@ static void test_migrate_auto_converge(void)

/*
* We want the test to be stable and as fast as possible.
* E.g., with 1Gb/s bandwith migration may pass without throttling,
* E.g., with 1Gb/s bandwidth migration may pass without throttling,
* so we need to decrease a bandwidth.
*/
const int64_t init_pct = 5, inc_pct = 25, max_pct = 95;
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/npcm7xx_timer-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static void test_pause_resume(gconstpointer test_data)
g_assert_true(qtest_get_irq(global_qtest, tim_timer_irq(td)));
}

/* Verifies that the prescaler can be changed while the timer is runnin. */
/* Verifies that the prescaler can be changed while the timer is running. */
static void test_prescaler_change(gconstpointer test_data)
{
const TestData *td = test_data;
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/tpm-emu.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static void *tpm_emu_tpm_thread(void *data)
s->tpm_msg->code = cpu_to_be32(TPM_FAIL);
break;
default:
g_debug("unsupport TPM version %u", s->tpm_version);
g_debug("unsupported TPM version %u", s->tpm_version);
g_assert_not_reached();
}
qio_channel_write(ioc, (char *)s->tpm_msg, be32_to_cpu(s->tpm_msg->len),
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/tpm-tests.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* QTest TPM commont test code
* QTest TPM common test code
*
* Copyright (c) 2018 IBM Corporation
* Copyright (c) 2018 Red Hat, Inc.
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/tpm-tests.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* QTest TPM commont test code
* QTest TPM common test code
*
* Copyright (c) 2018 IBM Corporation
*
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/tpm-tis-i2c-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ static void tpm_tis_i2c_test_check_access_reg_release(const void *data)
TPM_TIS_ACCESS_ACTIVE_LOCALITY);
/*
* highest locality should now be active; release it and make sure the
* next higest locality is active afterwards
* next highest locality is active afterwards
*/
for (l = TPM_TIS_NUM_LOCALITIES - 2; l >= 0; l--) {
if (l == locty) {
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/tpm-tis-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void tpm_tis_test_check_access_reg_release(const void *data)
TPM_TIS_ACCESS_ACTIVE_LOCALITY);
/*
* highest locality should now be active; release it and make sure the
* next higest locality is active afterwards
* next highest locality is active afterwards
*/
for (l = TPM_TIS_NUM_LOCALITIES - 2; l >= 0; l--) {
if (l == locty) {
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/vhost-user-blk-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg)
* Setup for hotplug.
*
* Since vhost-user server only serves one vhost-user client one time,
* another exprot
* another export
*
*/
static void *vhost_user_blk_hotplug_test_setup(GString *cmd_line, void *arg)
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/virtio-net-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void announce_self(void *obj, void *data, QGuestAllocator *t_alloc)
g_assert_cmpint(*proto, ==, htons(ETH_P_RARP));

/*
* Stop the announcment by settings rounds to 0 on the
* Stop the announcement by settings rounds to 0 on the
* existing timer.
*/
rsp = qmp("{ 'execute' : 'announce-self', "
Expand Down
2 changes: 1 addition & 1 deletion tests/qtest/vmgenid-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"
#define VMGENID_GUID_OFFSET 40 /* allow space for
* OVMF SDT Header Probe Supressor
* OVMF SDT Header Probe Suppressor
*/
#define RSDP_ADDR_INVALID 0x100000 /* RSDP must be below this address */

Expand Down

0 comments on commit 96420a3

Please sign in to comment.