Commit msgs contain some more detail, but these are just some basic tests for lang and keyboard settings. Unfortunately I have not discovered a way to test additional lang support, or additional keyboard settings. So if anyone has suggestions, let me know please.
Oh, also a small patch to fix a typo.
This is just a simple test which verifies that specifying a certain lang in your ks file actually produces an installed system with that lang set as the default. --- tests/kickstart_tests/lang.ks | 33 +++++++++++++++++++++++++++++ tests/kickstart_tests/lang.sh | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 tests/kickstart_tests/lang.ks create mode 100755 tests/kickstart_tests/lang.sh
diff --git a/tests/kickstart_tests/lang.ks b/tests/kickstart_tests/lang.ks new file mode 100644 index 0000000..e87b68c --- /dev/null +++ b/tests/kickstart_tests/lang.ks @@ -0,0 +1,33 @@ +#version=DEVEL +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/$basear..." +install +network --bootproto=dhcp + +bootloader --timeout=1 +zerombr +clearpart --all --initlabel +part --fstype=ext4 --size=4400 / +part --fstype=ext4 --size=500 /boot +part --fstype=swap --size=500 swap + +keyboard us +lang cs_CZ.UTF-8 +timezone America/New_York --utc +rootpw testcase +shutdown + +%packages +@core +%end + +%post +INSTLANG=cs_CZ.UTF-8 + +if [[ "$LANG" != "$INSTLANG" ]]; then + echo '*** specified language was not set' >> /root/RESULT +fi + +if [[ ! -e /root/RESULT ]]; then + echo SUCCESS > /root/RESULT +fi +%end diff --git a/tests/kickstart_tests/lang.sh b/tests/kickstart_tests/lang.sh new file mode 100755 index 0000000..549d07a --- /dev/null +++ b/tests/kickstart_tests/lang.sh @@ -0,0 +1,48 @@ +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# the GNU General Public License v.2, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY expressed or implied, including the implied warranties of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. You should have received a copy of the +# GNU General Public License along with this program; if not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the +# source code or documentation are not subject to the GNU General Public +# License and may only be used or replicated with the express permission of +# Red Hat, Inc. +# +# Red Hat Author(s): Chris Lumens clumens@redhat.com + +kernel_args() { + echo vnc +} + +prepare() { + ks=$1 + tmpdir=$2 + + echo ${ks} +} + +validate() { + img=$1 + + # There should be a /root/RESULT file with results in it. Check + # its contents and decide whether the test finally succeeded or + # not. + result=$(virt-cat -a ${img} -m /dev/sda2 /root/RESULT) + if [[ $? != 0 ]]; then + status=1 + echo '*** /root/RESULT does not exist in VM image.' + elif [[ "${result}" != "SUCCESS" ]]; then + status=1 + echo "${result}" + fi + + return ${status} +} +
On Thu, 2015-05-28 at 13:24 -0400, Samantha N. Bueno wrote:
This is just a simple test which verifies that specifying a certain lang in your ks file actually produces an installed system with that lang set as the default.
tests/kickstart_tests/lang.ks | 33 +++++++++++++++++++++++++++++ tests/kickstart_tests/lang.sh | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 tests/kickstart_tests/lang.ks create mode 100755 tests/kickstart_tests/lang.sh
diff --git a/tests/kickstart_tests/lang.ks b/tests/kickstart_tests/lang.ks new file mode 100644 index 0000000..e87b68c --- /dev/null +++ b/tests/kickstart_tests/lang.ks @@ -0,0 +1,33 @@ +#version=DEVEL +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/$basear..." +install +network --bootproto=dhcp
+bootloader --timeout=1 +zerombr +clearpart --all --initlabel +part --fstype=ext4 --size=4400 / +part --fstype=ext4 --size=500 /boot +part --fstype=swap --size=500 swap
+keyboard us +lang cs_CZ.UTF-8 +timezone America/New_York --utc +rootpw testcase +shutdown
+%packages +@core +%end
+%post +INSTLANG=cs_CZ.UTF-8
+if [[ "$LANG" != "$INSTLANG" ]]; then
- echo '*** specified language was not set' >> /root/RESULT
+fi
This tests if the end of the installation runs with the $LANG set properly which is probably not what you intended. To check the configuration of the installed system, it would be better to check the contents of the /etc/locale.conf file. See write_language_configuration() for more details.
+if [[ ! -e /root/RESULT ]]; then
- echo SUCCESS > /root/RESULT
+fi +%end
This is just a simple test which verifies that specifying a certain keyboard in your ks file actually produces an installed system with that keyboard set as the default. --- tests/kickstart_tests/keyboard.ks | 35 ++++++++++++++++++++++++++++ tests/kickstart_tests/keyboard.sh | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 tests/kickstart_tests/keyboard.ks create mode 100755 tests/kickstart_tests/keyboard.sh
diff --git a/tests/kickstart_tests/keyboard.ks b/tests/kickstart_tests/keyboard.ks new file mode 100644 index 0000000..2922eb8 --- /dev/null +++ b/tests/kickstart_tests/keyboard.ks @@ -0,0 +1,35 @@ +#version=DEVEL +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/$basear..." +install +network --bootproto=dhcp + +bootloader --timeout=1 +zerombr +clearpart --all --initlabel +part --fstype=ext4 --size=4400 / +part --fstype=ext4 --size=500 /boot +part --fstype=swap --size=500 swap + +keyboard --vckeymap cz --xlayouts=cz +lang cs_CZ.UTF-8 +timezone America/New_York --utc +rootpw testcase +shutdown + +%packages +@core +%end + +%post +INSTKBD=cz +KBD=`grep KEYMAP /etc/vconsole.conf | awk -F" '{ print $2 }'` +echo "$KBD" + +if [[ "$KBD" != "$INSTKBD" ]]; then + echo '*** specified keyboard was not set' >> /root/RESULT +fi + +if [[ ! -e /root/RESULT ]]; then + echo SUCCESS > /root/RESULT +fi +%end diff --git a/tests/kickstart_tests/keyboard.sh b/tests/kickstart_tests/keyboard.sh new file mode 100755 index 0000000..549d07a --- /dev/null +++ b/tests/kickstart_tests/keyboard.sh @@ -0,0 +1,48 @@ +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# the GNU General Public License v.2, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY expressed or implied, including the implied warranties of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. You should have received a copy of the +# GNU General Public License along with this program; if not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the +# source code or documentation are not subject to the GNU General Public +# License and may only be used or replicated with the express permission of +# Red Hat, Inc. +# +# Red Hat Author(s): Chris Lumens clumens@redhat.com + +kernel_args() { + echo vnc +} + +prepare() { + ks=$1 + tmpdir=$2 + + echo ${ks} +} + +validate() { + img=$1 + + # There should be a /root/RESULT file with results in it. Check + # its contents and decide whether the test finally succeeded or + # not. + result=$(virt-cat -a ${img} -m /dev/sda2 /root/RESULT) + if [[ $? != 0 ]]; then + status=1 + echo '*** /root/RESULT does not exist in VM image.' + elif [[ "${result}" != "SUCCESS" ]]; then + status=1 + echo "${result}" + fi + + return ${status} +} +
On Thu, 2015-05-28 at 13:24 -0400, Samantha N. Bueno wrote:
This is just a simple test which verifies that specifying a certain keyboard in your ks file actually produces an installed system with that keyboard set as the default.
tests/kickstart_tests/keyboard.ks | 35 ++++++++++++++++++++++++++++ tests/kickstart_tests/keyboard.sh | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 tests/kickstart_tests/keyboard.ks create mode 100755 tests/kickstart_tests/keyboard.sh
diff --git a/tests/kickstart_tests/keyboard.ks b/tests/kickstart_tests/keyboard.ks new file mode 100644 index 0000000..2922eb8 --- /dev/null +++ b/tests/kickstart_tests/keyboard.ks @@ -0,0 +1,35 @@ +#version=DEVEL +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/$basear..." +install +network --bootproto=dhcp
+bootloader --timeout=1 +zerombr +clearpart --all --initlabel +part --fstype=ext4 --size=4400 / +part --fstype=ext4 --size=500 /boot +part --fstype=swap --size=500 swap
+keyboard --vckeymap cz --xlayouts=cz +lang cs_CZ.UTF-8 +timezone America/New_York --utc +rootpw testcase +shutdown
+%packages +@core +%end
+%post +INSTKBD=cz +KBD=`grep KEYMAP /etc/vconsole.conf | awk -F" '{ print $2 }'` +echo "$KBD"
+if [[ "$KBD" != "$INSTKBD" ]]; then
- echo '*** specified keyboard was not set' >> /root/RESULT
+fi
Would be nice to also check contents of /etc/X11/xorg.conf.d/00-keyboard.conf
+if [[ ! -e /root/RESULT ]]; then
- echo SUCCESS > /root/RESULT
+fi +%end
--- tests/kickstart_tests/run_one_ks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/kickstart_tests/run_one_ks.sh b/tests/kickstart_tests/run_one_ks.sh index 168edf9..0045aa4 100755 --- a/tests/kickstart_tests/run_one_ks.sh +++ b/tests/kickstart_tests/run_one_ks.sh @@ -141,7 +141,7 @@ while getopts ":i:k:" opt; do ;;
*) - echo "Usage: run_one_ks.sh -i ISO [-k KEEPIT] ks.cfg" + echo "Usage: run_one_ks.sh -i ISO [-k KEEPIT] ks-test.sh" exit 1 ;; esac
On Thu, May 28, 2015 at 01:24:31PM -0400, Samantha N. Bueno wrote:
Commit msgs contain some more detail, but these are just some basic tests for lang and keyboard settings. Unfortunately I have not discovered a way to test additional lang support, or additional keyboard settings. So if anyone has suggestions, let me know please.
Oh, also a small patch to fix a typo.
These look ok to me.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Samantha N. Bueno -
Vratislav Podzimek