Use the adapted Timezone class for kickstart data

anaconda.spec.in

@@ -21,7 +21,7 @@ Source0: %{name}-%{version}.tar.bz2
 # Also update in AM_GNU_GETTEXT_VERSION in configure.ac
 %define gettextver 0.18.3
 %define intltoolver 0.31.2-3
-%define pykickstartver 2.6
+%define pykickstartver 2.8
 %define dnfver 0.6.4
 %define partedver 1.8.1
 %define pypartedver 2.5-2

pyanaconda/kickstart.py

@@ -1635,9 +1635,9 @@ def execute(self, storage, ksdata, instClass, users):
         for usr in self.sshUserList:
             users.setUserSshKey(usr.username, usr.key)
 
-class Timezone(commands.timezone.F18_Timezone):
+class Timezone(commands.timezone.F23_Timezone):
     def __init__(self, *args):
-        commands.timezone.F18_Timezone.__init__(self, *args)
+        commands.timezone.F23_Timezone.__init__(self, *args)
 
         self._added_chrony = False
         self._enabled_chrony = False

tests/kickstart_tests/ntp-pools.ks

@@ -0,0 +1,40 @@
+#version=DEVEL
+url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/$basearch/os/"
+install
+network --bootproto=dhcp
+
+# use ntp.cesnet.cz as an NTP server and 0.pool.ntp.org as an NTP pool
+timezone --utc --ntpservers=ntp.cesnet.cz,0.pool.ntp.org,0.pool.ntp.org,0.pool.ntp.org,0.pool.ntp.org Europe/Prague
+
+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 en_US.UTF-8
+timezone America/New_York --utc
+rootpw testcase
+shutdown
+
+%packages --default
+%end
+
+%post
+# server 0.fedora.pool.ntp.org iburst
+egrep '^\s*server\s*ntp\.cesnet\.cz\s*[a-zA-Z]+\s*$' /etc/chrony.conf
+if [ $? -ne 0 ]; then
+    echo '*** ntp.cesnet.cz not configured as an NTP server' >> /root/RESULT
+fi
+
+egrep '^\s*pool\s*0\.pool\.ntp\.org\s*[a-zA-Z]+\s*$' /etc/chrony.conf
+if [ $? -ne 0 ]; then
+    echo '*** 0.pool.ntp.org not configured as an NTP pool' >> /root/RESULT
+fi
+
+if [ ! -e /root/RESULT ]; then
+   echo SUCCESS > /root/RESULT
+fi
+%end

tests/kickstart_tests/ntp-pools.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}
+}
+