[node-patches] Change in ovirt-node[master]: tests: Switch sets syntax
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Wed Sep 19 09:02:53 UTC 2012
Fabian Deutsch has uploaded a new change for review.
Change subject: tests: Switch sets syntax
......................................................................
tests: Switch sets syntax
YAML is now used to specify testsets this is more future proof.
Change-Id: I11be4c39c41babcd5e269910d18bb267cfaaebd5
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M tests/igor/sets/after_auto_install.set
M tests/igor/sets/after_testing.set
M tests/igor/sets/basic.set
M tests/igor/sets/before_testing.set
M tests/igor/sets/python.set
M tests/igor/sets/reboot.set
M tests/igor/sets/selinux.set
M tests/igor/sets/services.set
M tests/igor/sets/tui/check_navigation.set
M tests/igor/sets/tui/login.set
M tests/igor/sets/tui/manual_installation_basic.set
M tests/igor/sets/tui/manual_installation_extended.set
12 files changed, 137 insertions(+), 166 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/45/8045/1
diff --git a/tests/igor/sets/after_auto_install.set b/tests/igor/sets/after_auto_install.set
index 813f8a3..a7f651c 100644
--- a/tests/igor/sets/after_auto_install.set
+++ b/tests/igor/sets/after_auto_install.set
@@ -1,18 +1,17 @@
-#
-# After auto install
-# One testcase per line, this is no script
-#
-
-searchpath:../
-
-lib:libs/common
+---
+description: 'Notes the server about a successfull auto-installation.'
+lib: ['../libs/common']
+searchpath: '../tcs'
-searchpath:../tcs
+---
+filename: 'installation_completed.sh'
+timeout: 900
-# This includes the first boot, the installation and the associated reboot
-installation_completed.sh timeout=900
+---
+filename: 'collect_logs.sh'
-collect_logs.sh
+---
+filename: 'set_admin_password.py'
-set_admin_password.py
+---
diff --git a/tests/igor/sets/after_testing.set b/tests/igor/sets/after_testing.set
index 6173cf0..b7e5c2c 100644
--- a/tests/igor/sets/after_testing.set
+++ b/tests/igor/sets/after_testing.set
@@ -1,16 +1,13 @@
-#
-# Does some stuff after all testcases were run
-# One testcase per line, this is no script
-#
-
-searchpath:../
+---
+description: 'Collect logs after all testing has been done (for debugging e.g.)'
+lib: ['../libs/common']
+searchpath: '../tcs'
-lib:libs/common
+---
+filename: 'check_dmesg.sh'
+---
+filename: 'collect_logs.sh'
-searchpath:../tcs/
-
-check_dmesg.sh
-
-collect_logs.sh
+---
diff --git a/tests/igor/sets/basic.set b/tests/igor/sets/basic.set
index bbc62a8..950eb13 100644
--- a/tests/igor/sets/basic.set
+++ b/tests/igor/sets/basic.set
@@ -1,9 +1,7 @@
-#
-# Include some basic libraries
-# One testcase per line, this is no script
-#
-
-searchpath:../
+---
+description: 'Inlcude the common library'
+lib: ['../libs/common']
+searchpath: '../tcs'
-lib:libs/common
+---
diff --git a/tests/igor/sets/before_testing.set b/tests/igor/sets/before_testing.set
index 4fca9af..6818482 100644
--- a/tests/igor/sets/before_testing.set
+++ b/tests/igor/sets/before_testing.set
@@ -1,11 +1,10 @@
-#
-# Does some stuff before all testcases run
-# One testcase per line, this is no script
-#
-
-searchpath:../libs
-lib:common
+---
+description: 'Collect some logs before duoing anything'
+lib: ['../libs/common']
+searchpath: '../tcs'
-searchpath:../tcs/
-collect_logs.sh
+---
+filename: 'collect_logs.sh'
+
+---
diff --git a/tests/igor/sets/python.set b/tests/igor/sets/python.set
index ded7f7b..7946216 100644
--- a/tests/igor/sets/python.set
+++ b/tests/igor/sets/python.set
@@ -1,19 +1,10 @@
-#
-# Does some basic checks
-# One testcase per line, this is no script
-#
-
-#
-# Libraries
-#
-searchpath:../libs
-
-lib:common
+---
+description: 'Does python checks whcih can just be run at runtime.'
+lib: ['../libs/common']
+searchpath: '../tcs'
-#
-# Testcases
-#
-searchpath:../tcs
+---
+filename: 'python/run_doctests.py'
-python/run_doctests.py
+---
diff --git a/tests/igor/sets/reboot.set b/tests/igor/sets/reboot.set
index 063919c..e0b5e46 100644
--- a/tests/igor/sets/reboot.set
+++ b/tests/igor/sets/reboot.set
@@ -1,13 +1,16 @@
-#
-# Runs a reboot cycle
-# One testcase per line, this is no script
-#
-
-searchpath:../
+---
+description: 'Covers a reboot cycle - initiate and back up'
+lib: ['../libs/common']
+searchpath: '../tcs'
-lib:libs/common
+---
+filename: 'reboot_initiate.sh'
+timeout: 10
+---
+filename: 'reboot_completed.sh'
+# Rebooting takes a while
+timeout: 240
-tcs/reboot_initiate.sh timeout=10
-tcs/reboot_completed.sh timeout=240 # Rebooting takes a while
+---
diff --git a/tests/igor/sets/selinux.set b/tests/igor/sets/selinux.set
index 6151b84..ba4c718 100644
--- a/tests/igor/sets/selinux.set
+++ b/tests/igor/sets/selinux.set
@@ -1,12 +1,10 @@
-#
-# Does some basic selinux checks
-# One testcase per line, this is no script
-#
-
-searchpath:../
+---
+description: 'Does some basic selinux checks'
+lib: ['../libs/common']
+searchpath: '../tcs'
-lib:libs/common
+---
+filename: 'selinux-denials.sh'
-
-tcs/selinux-denials.sh
+---
diff --git a/tests/igor/sets/services.set b/tests/igor/sets/services.set
index dfed58d..127a183 100644
--- a/tests/igor/sets/services.set
+++ b/tests/igor/sets/services.set
@@ -1,14 +1,14 @@
-#
-# Does some checks on services
-# One testcase per line, this is no script
-#
-
-searchpath:../
+---
+description: 'Does some checks on services'
+lib: ['libs/common']
+searchpath: '../tcs'
-lib:libs/common
-
+---
# First wait for boot process to finish
-tcs/wait_for_getty.sh
+filename: 'wait_for_getty.sh'
-tcs/services_are_running.sh
+---
+filename: 'services_are_running.sh'
+
+---
diff --git a/tests/igor/sets/tui/check_navigation.set b/tests/igor/sets/tui/check_navigation.set
index 4d791d5..f0dab9e 100644
--- a/tests/igor/sets/tui/check_navigation.set
+++ b/tests/igor/sets/tui/check_navigation.set
@@ -1,20 +1,10 @@
-#
-# Does some TUI navigation checks
-# One testcase per line, this is no script
-#
-
-#
-# Libraries
-#
-searchpath:../../libs
-
-lib:common
-lib:uinput
+---
+description: 'Do some basic TUI checks'
+lib: ['../../libs/common', '../../libs/uinput']
+searchpath: '../../tcs'
-#
-# Testcases
-#
-searchpath:../../tcs
+---
+filename: 'uinput/enter_all_top_menus.py'
-uinput/enter_all_top_menus.py
+---
diff --git a/tests/igor/sets/tui/login.set b/tests/igor/sets/tui/login.set
index bf45c39..b9af712 100644
--- a/tests/igor/sets/tui/login.set
+++ b/tests/igor/sets/tui/login.set
@@ -1,21 +1,13 @@
-#
-# Does some basic TUI checks
-# One testcase per line, this is no script
-#
-
-#
-# Libraries
-#
-searchpath:../../libs
-
-lib:common
-lib:uinput
+---
+description: 'Log in to the TUI using teh passwod in after_auto_install.set'
+lib: ['../../libs/common', '../../libs/uinput']
+searchpath: '../../tcs'
-#
-# Testcases
-#
-searchpath:../../tcs
+---
+filename: 'wait_for_getty.sh'
-wait_for_getty.sh
-uinput/login_as_admin.py
+---
+filename: 'uinput/login_as_admin.py'
+
+---
diff --git a/tests/igor/sets/tui/manual_installation_basic.set b/tests/igor/sets/tui/manual_installation_basic.set
index 05a9096..5fae6b4 100644
--- a/tests/igor/sets/tui/manual_installation_basic.set
+++ b/tests/igor/sets/tui/manual_installation_basic.set
@@ -1,25 +1,24 @@
-#
-# A basic TUI installation
-# One testcase per line, this is no script
-#
-
-#
-# Libraries
-#
-searchpath:../../libs
-
-lib:common
-lib:uinput
+---
+description: 'A basic TUI installation'
+lib: ['../../libs/common', '../../libs/uinput']
+searchpath: '../../tcs'
-#
-# Testcases
-#
-searchpath:../../tcs
+---
+filename: 'boot_completed.sh'
-boot_completed.sh
+---
+filename: 'wait_for_installer_welcome_page.sh'
+timeout: 70
-wait_for_installer_welcome_page.sh timeout=70
-uinput/basic_tui_installation.py timeout=300 # Timeout for install
+---
+filename: 'uinput/basic_tui_installation.py'
+# Timeout for install
+timeout: 300
-reboot_completed.sh timeout=70 # Timeout for reboot
+---
+filename: 'reboot_completed.sh'
+# Timeout for reboot
+timeout: 70
+
+---
diff --git a/tests/igor/sets/tui/manual_installation_extended.set b/tests/igor/sets/tui/manual_installation_extended.set
index 9d1bc93..b56c0ec 100644
--- a/tests/igor/sets/tui/manual_installation_extended.set
+++ b/tests/igor/sets/tui/manual_installation_extended.set
@@ -1,32 +1,37 @@
-#
-# A extended TUI installation, one testcase per page
-# One testcase per line, this is no script
-#
-
-#
-# Libraries
-#
-searchpath:../../libs
-
-lib:common
-lib:uinput
+---
+description: 'A extended TUI installation, one testcase per page'
+lib: ['../../libs/common', '../../libs/uinput']
+searchpath: '../../tcs/uinput/installer'
-#
-# Testcases
-#
-searchpath:../../tcs
+---
+filename: '../../wait_for_installer_welcome_page.sh'
+timeout: 70
-wait_for_installer_welcome_page.sh timeout=70
+---
+filename: '01_welcome_page.py'
-searchpath:../../tcs/uinput/installer
-01_welcome_page.py
-02_keyboard_page.py
-03_boot_device_page.py
-04_installation_device_page.py
-05_password_page.py
-06_progress_page.py timeout=120 # Timeout for installation
+---
+filename: '02_keyboard_page.py'
+
+---
+filename: '03_boot_device_page.py'
+
+---
+filename: '04_installation_device_page.py'
+
+---
+filename: '05_password_page.py'
+
+---
+filename: '06_progress_page.py'
+# Timeout for installation
+timeout: 120
+
+---
# Ends with a reboot
+filename: '../../reboot_completed.sh'
+# Timeout for reboot
+timeout: 70
-searchpath:../../tcs/
-reboot_completed.sh timeout=70 # Timeout for reboot
+---
--
To view, visit http://gerrit.ovirt.org/8045
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11be4c39c41babcd5e269910d18bb267cfaaebd5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
More information about the node-patches
mailing list