tests/acceptance: rename tests acceptance to tests avocado

In the discussion about renaming the `tests/acceptance` [1], the
conclusion was that the folders inside `tests` are related to the
framework running the tests and not directly related to the type of
the tests.

This changes the folder to `tests/avocado` and adjusts the MAKEFILE, the
CI related files and the documentation.

[1] https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06553.html

Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20211105155354.154864-3-willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

53 files changed, 15 insertions, 15 deletions

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8e8ee58493..4c564cf789 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -89,7 +89,7 @@ TESTS_VENV_DIR=$(BUILD_DIR)/tests/venv
 TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt
 TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
 ifndef AVOCADO_TESTS
-	AVOCADO_TESTS=tests/acceptance
+	AVOCADO_TESTS=tests/avocado
 endif
 # Controls the output generated by Avocado when running tests.
 # Any number of command separated loggers are accepted.  For more
@@ -140,7 +140,7 @@ check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
 			--filter-by-tags-include-empty-key) \
             $(AVOCADO_CMDLINE_TAGS) \
             $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
-            "AVOCADO", "tests/acceptance")
+            "AVOCADO", "tests/avocado")
 
 check-acceptance-deprecated-warning:
 	@echo
diff --git a/tests/acceptance/README.rst b/tests/acceptance/README.rst
deleted file mode 100644
index 89260faed6..0000000000
--- a/tests/acceptance/README.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-============================================
-Acceptance tests using the Avocado Framework
-============================================
-
-This directory contains functional tests, also known as acceptance
-level tests.  They're usually higher level, and may interact with
-external resources and with various guest operating systems.
-
-For more information, please refer to ``docs/devel/testing.rst``,
-section "Acceptance tests using the Avocado Framework".
diff --git a/tests/avocado/README.rst b/tests/avocado/README.rst
new file mode 100644
index 0000000000..94488371bb
--- /dev/null
+++ b/tests/avocado/README.rst
@@ -0,0 +1,10 @@
+=============================================
+Integration tests using the Avocado Framework
+=============================================
+
+This directory contains integration tests. They're usually higher
+level, and may interact with external resources and with various
+guest operating systems.
+
+For more information, please refer to ``docs/devel/testing.rst``,
+section "Integration tests using the Avocado Framework".
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py
index 1841053e2c..cd21b59e04 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -27,7 +27,7 @@ from avocado.utils.path import find_command
 BUILD_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
 
 if os.path.islink(os.path.dirname(os.path.dirname(__file__))):
-    # The link to the acceptance tests dir in the source code directory
+    # The link to the avocado tests dir in the source code directory
     lnk = os.path.dirname(os.path.dirname(__file__))
     #: The QEMU root source directory
     SOURCE_DIR = os.path.dirname(os.path.dirname(os.readlink(lnk)))
diff --git a/tests/acceptance/boot_linux.py b/tests/avocado/boot_linux.py
index ab19146d1e..ab19146d1e 100644
--- a/tests/acceptance/boot_linux.py
+++ b/tests/avocado/boot_linux.py
diff --git a/tests/acceptance/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 06fc967f6c..06fc967f6c 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
diff --git a/tests/acceptance/boot_xen.py b/tests/avocado/boot_xen.py
index fc2faeedb5..fc2faeedb5 100644
--- a/tests/acceptance/boot_xen.py
+++ b/tests/avocado/boot_xen.py
diff --git a/tests/acceptance/cpu_queries.py b/tests/avocado/cpu_queries.py
index cc9e380cc7..cc9e380cc7 100644
--- a/tests/acceptance/cpu_queries.py
+++ b/tests/avocado/cpu_queries.py
diff --git a/tests/acceptance/empty_cpu_model.py b/tests/avocado/empty_cpu_model.py
index a1e59e45e4..a1e59e45e4 100644
--- a/tests/acceptance/empty_cpu_model.py
+++ b/tests/avocado/empty_cpu_model.py
diff --git a/tests/acceptance/hotplug_cpu.py b/tests/avocado/hotplug_cpu.py
index 6374bf1b54..6374bf1b54 100644
--- a/tests/acceptance/hotplug_cpu.py
+++ b/tests/avocado/hotplug_cpu.py
diff --git a/tests/acceptance/info_usernet.py b/tests/avocado/info_usernet.py
index 9c1fd903a0..9c1fd903a0 100644
--- a/tests/acceptance/info_usernet.py
+++ b/tests/avocado/info_usernet.py
diff --git a/tests/acceptance/intel_iommu.py b/tests/avocado/intel_iommu.py
index 474d62f6bf..474d62f6bf 100644
--- a/tests/acceptance/intel_iommu.py
+++ b/tests/avocado/intel_iommu.py
diff --git a/tests/acceptance/linux_initrd.py b/tests/avocado/linux_initrd.py
index a249e2f14a..9b4880cd8c 100644
--- a/tests/acceptance/linux_initrd.py
+++ b/tests/avocado/linux_initrd.py
@@ -1,4 +1,4 @@
-# Linux initrd acceptance test.
+# Linux initrd integration test.
 #
 # Copyright (c) 2018 Red Hat, Inc.
 #
diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/avocado/linux_ssh_mips_malta.py
index 4de1947418..4de1947418 100644
--- a/tests/acceptance/linux_ssh_mips_malta.py
+++ b/tests/avocado/linux_ssh_mips_malta.py
diff --git a/tests/acceptance/machine_arm_canona1100.py b/tests/avocado/machine_arm_canona1100.py
index 0e5c43dbcf..0e5c43dbcf 100644
--- a/tests/acceptance/machine_arm_canona1100.py
+++ b/tests/avocado/machine_arm_canona1100.py
diff --git a/tests/acceptance/machine_arm_integratorcp.py b/tests/avocado/machine_arm_integratorcp.py
index 49c8ebff78..49c8ebff78 100644
--- a/tests/acceptance/machine_arm_integratorcp.py
+++ b/tests/avocado/machine_arm_integratorcp.py
diff --git a/tests/acceptance/machine_arm_n8x0.py b/tests/avocado/machine_arm_n8x0.py
index e5741f2d8d..e5741f2d8d 100644
--- a/tests/acceptance/machine_arm_n8x0.py
+++ b/tests/avocado/machine_arm_n8x0.py
diff --git a/tests/acceptance/machine_avr6.py b/tests/avocado/machine_avr6.py
index 6baf4e9c7f..6bab31342a 100644
--- a/tests/acceptance/machine_avr6.py
+++ b/tests/avocado/machine_avr6.py
@@ -1,5 +1,5 @@
 #
-# QEMU AVR acceptance tests
+# QEMU AVR integration tests
 #
 # Copyright (c) 2019-2020 Michael Rolnik <mrolnik@gmail.com>
 #
diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/avocado/machine_m68k_nextcube.py
index 09e2745cc5..09e2745cc5 100644
--- a/tests/acceptance/machine_m68k_nextcube.py
+++ b/tests/avocado/machine_m68k_nextcube.py
diff --git a/tests/acceptance/machine_microblaze.py b/tests/avocado/machine_microblaze.py
index 7f6d18495d..7f6d18495d 100644
--- a/tests/acceptance/machine_microblaze.py
+++ b/tests/avocado/machine_microblaze.py
diff --git a/tests/acceptance/machine_mips_fuloong2e.py b/tests/avocado/machine_mips_fuloong2e.py
index 0ac285e2af..0ac285e2af 100644
--- a/tests/acceptance/machine_mips_fuloong2e.py
+++ b/tests/avocado/machine_mips_fuloong2e.py
diff --git a/tests/acceptance/machine_mips_loongson3v.py b/tests/avocado/machine_mips_loongson3v.py
index 85b131a40f..85b131a40f 100644
--- a/tests/acceptance/machine_mips_loongson3v.py
+++ b/tests/avocado/machine_mips_loongson3v.py
diff --git a/tests/acceptance/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py
index b67d8cb141..b67d8cb141 100644
--- a/tests/acceptance/machine_mips_malta.py
+++ b/tests/avocado/machine_mips_malta.py
diff --git a/tests/acceptance/machine_rx_gdbsim.py b/tests/avocado/machine_rx_gdbsim.py
index 32b737b6d8..32b737b6d8 100644
--- a/tests/acceptance/machine_rx_gdbsim.py
+++ b/tests/avocado/machine_rx_gdbsim.py
diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
index 4028c99afc..4028c99afc 100644
--- a/tests/acceptance/machine_s390_ccw_virtio.py
+++ b/tests/avocado/machine_s390_ccw_virtio.py
diff --git a/tests/acceptance/machine_sparc64_sun4u.py b/tests/avocado/machine_sparc64_sun4u.py
index 458165500e..458165500e 100644
--- a/tests/acceptance/machine_sparc64_sun4u.py
+++ b/tests/avocado/machine_sparc64_sun4u.py
diff --git a/tests/acceptance/machine_sparc_leon3.py b/tests/avocado/machine_sparc_leon3.py
index 2405cd7a0d..2405cd7a0d 100644
--- a/tests/acceptance/machine_sparc_leon3.py
+++ b/tests/avocado/machine_sparc_leon3.py
diff --git a/tests/acceptance/migration.py b/tests/avocado/migration.py
index 792639cb69..792639cb69 100644
--- a/tests/acceptance/migration.py
+++ b/tests/avocado/migration.py
diff --git a/tests/acceptance/multiprocess.py b/tests/avocado/multiprocess.py
index 96627f022a..96627f022a 100644
--- a/tests/acceptance/multiprocess.py
+++ b/tests/avocado/multiprocess.py
diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_hotplug_props.py
index 2e86d5017a..2e86d5017a 100644
--- a/tests/acceptance/pc_cpu_hotplug_props.py
+++ b/tests/avocado/pc_cpu_hotplug_props.py
diff --git a/tests/acceptance/ppc_405.py b/tests/avocado/ppc_405.py
index c534d5d32f..c534d5d32f 100644
--- a/tests/acceptance/ppc_405.py
+++ b/tests/avocado/ppc_405.py
diff --git a/tests/acceptance/ppc_bamboo.py b/tests/avocado/ppc_bamboo.py
index dd33bf66f3..dd33bf66f3 100644
--- a/tests/acceptance/ppc_bamboo.py
+++ b/tests/avocado/ppc_bamboo.py
diff --git a/tests/acceptance/ppc_mpc8544ds.py b/tests/avocado/ppc_mpc8544ds.py
index ce840600c1..ce840600c1 100644
--- a/tests/acceptance/ppc_mpc8544ds.py
+++ b/tests/avocado/ppc_mpc8544ds.py
diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/avocado/ppc_prep_40p.py
index 5e61e686bd..5e61e686bd 100644
--- a/tests/acceptance/ppc_prep_40p.py
+++ b/tests/avocado/ppc_prep_40p.py
diff --git a/tests/acceptance/ppc_pseries.py b/tests/avocado/ppc_pseries.py
index f14a884ee1..f14a884ee1 100644
--- a/tests/acceptance/ppc_pseries.py
+++ b/tests/avocado/ppc_pseries.py
diff --git a/tests/acceptance/ppc_virtex_ml507.py b/tests/avocado/ppc_virtex_ml507.py
index 27f7bf2d49..27f7bf2d49 100644
--- a/tests/acceptance/ppc_virtex_ml507.py
+++ b/tests/avocado/ppc_virtex_ml507.py
diff --git a/tests/acceptance/replay_kernel.py b/tests/avocado/replay_kernel.py
index c68a953730..c68a953730 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
diff --git a/tests/acceptance/replay_linux.py b/tests/avocado/replay_linux.py
index 15953f9e49..15953f9e49 100644
--- a/tests/acceptance/replay_linux.py
+++ b/tests/avocado/replay_linux.py
diff --git a/tests/acceptance/reverse_debugging.py b/tests/avocado/reverse_debugging.py
index d2921e70c3..d2921e70c3 100644
--- a/tests/acceptance/reverse_debugging.py
+++ b/tests/avocado/reverse_debugging.py
diff --git a/tests/acceptance/smmu.py b/tests/avocado/smmu.py
index b3c4de6bf4..b3c4de6bf4 100644
--- a/tests/acceptance/smmu.py
+++ b/tests/avocado/smmu.py
diff --git a/tests/acceptance/tcg_plugins.py b/tests/avocado/tcg_plugins.py
index 9ca1515c3b..9ca1515c3b 100644
--- a/tests/acceptance/tcg_plugins.py
+++ b/tests/avocado/tcg_plugins.py
diff --git a/tests/acceptance/tesseract_utils.py b/tests/avocado/tesseract_utils.py
index 72cd9ab798..72cd9ab798 100644
--- a/tests/acceptance/tesseract_utils.py
+++ b/tests/avocado/tesseract_utils.py
diff --git a/tests/acceptance/version.py b/tests/avocado/version.py
index 79b923d4fc..79b923d4fc 100644
--- a/tests/acceptance/version.py
+++ b/tests/avocado/version.py
diff --git a/tests/acceptance/virtio-gpu.py b/tests/avocado/virtio-gpu.py
index 4acc1e6d5f..4acc1e6d5f 100644
--- a/tests/acceptance/virtio-gpu.py
+++ b/tests/avocado/virtio-gpu.py
diff --git a/tests/acceptance/virtio_check_params.py b/tests/avocado/virtio_check_params.py
index 87e6c839d1..87e6c839d1 100644
--- a/tests/acceptance/virtio_check_params.py
+++ b/tests/avocado/virtio_check_params.py
diff --git a/tests/acceptance/virtio_version.py b/tests/avocado/virtio_version.py
index 33593c29dd..33593c29dd 100644
--- a/tests/acceptance/virtio_version.py
+++ b/tests/avocado/virtio_version.py
diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/avocado/virtiofs_submounts.py
index 21ad7d792e..21ad7d792e 100644
--- a/tests/acceptance/virtiofs_submounts.py
+++ b/tests/avocado/virtiofs_submounts.py
diff --git a/tests/acceptance/virtiofs_submounts.py.data/cleanup.sh b/tests/avocado/virtiofs_submounts.py.data/cleanup.sh
index 2a6579a0fe..2a6579a0fe 100644
--- a/tests/acceptance/virtiofs_submounts.py.data/cleanup.sh
+++ b/tests/avocado/virtiofs_submounts.py.data/cleanup.sh
diff --git a/tests/acceptance/virtiofs_submounts.py.data/guest-cleanup.sh b/tests/avocado/virtiofs_submounts.py.data/guest-cleanup.sh
index 729cb2d1a5..729cb2d1a5 100644
--- a/tests/acceptance/virtiofs_submounts.py.data/guest-cleanup.sh
+++ b/tests/avocado/virtiofs_submounts.py.data/guest-cleanup.sh
diff --git a/tests/acceptance/virtiofs_submounts.py.data/guest.sh b/tests/avocado/virtiofs_submounts.py.data/guest.sh
index 59ba40fde1..59ba40fde1 100644
--- a/tests/acceptance/virtiofs_submounts.py.data/guest.sh
+++ b/tests/avocado/virtiofs_submounts.py.data/guest.sh
diff --git a/tests/acceptance/virtiofs_submounts.py.data/host.sh b/tests/avocado/virtiofs_submounts.py.data/host.sh
index d8a9afebdb..d8a9afebdb 100644
--- a/tests/acceptance/virtiofs_submounts.py.data/host.sh
+++ b/tests/avocado/virtiofs_submounts.py.data/host.sh
diff --git a/tests/acceptance/vnc.py b/tests/avocado/vnc.py
index f301fbb4f5..f301fbb4f5 100644
--- a/tests/acceptance/vnc.py
+++ b/tests/avocado/vnc.py
diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/avocado/x86_cpu_model_versions.py
index 0e9feda62d..0e9feda62d 100644
--- a/tests/acceptance/x86_cpu_model_versions.py
+++ b/tests/avocado/x86_cpu_model_versions.py