[PATCH 1/5] Move kickstart_test .ks files to .ks.in.

David Shea dshea at redhat.com
Mon Sep 14 19:24:32 UTC 2015


On 09/11/2015 01:12 PM, Chris Lumens wrote:
> ---
>   tests/Makefile.am                                  |   2 +-
>   tests/kickstart_tests/basic-ftp.ks                 |  22 ---
>   tests/kickstart_tests/basic-ftp.ks.in              |  22 +++
>   tests/kickstart_tests/basic-ostree.ks              |  20 ---
>   tests/kickstart_tests/basic-ostree.ks.in           |  20 +++
>   tests/kickstart_tests/bond.ks                      |  56 -------
>   tests/kickstart_tests/bond.ks.in                   |  56 +++++++
>   tests/kickstart_tests/btrfs-1.ks                   |  48 ------
>   tests/kickstart_tests/btrfs-1.ks.in                |  48 ++++++
>   tests/kickstart_tests/btrfs-2.ks                   |  59 -------
>   tests/kickstart_tests/btrfs-2.ks.in                |  59 +++++++
>   tests/kickstart_tests/default-fstype.ks            |  38 -----
>   tests/kickstart_tests/default-fstype.ks.in         |  38 +++++
>   tests/kickstart_tests/driverdisk-disk.ks           |  41 -----
>   tests/kickstart_tests/driverdisk-disk.ks.in        |  41 +++++
>   tests/kickstart_tests/encrypt-device.ks            |  32 ----
>   tests/kickstart_tests/encrypt-device.ks.in         |  32 ++++
>   tests/kickstart_tests/escrow-cert.ks               | 108 -------------
>   tests/kickstart_tests/escrow-cert.ks.in            | 108 +++++++++++++
>   tests/kickstart_tests/firewall.ks                  |  59 -------
>   tests/kickstart_tests/firewall.ks.in               |  59 +++++++
>   tests/kickstart_tests/groups-and-envs-1.ks         |  36 -----
>   tests/kickstart_tests/groups-and-envs-1.ks.in      |  36 +++++
>   tests/kickstart_tests/groups-and-envs-2.ks         |  80 ----------
>   tests/kickstart_tests/groups-and-envs-2.ks.in      |  80 ++++++++++
>   tests/kickstart_tests/groups-and-envs-3.ks         |  34 ----
>   tests/kickstart_tests/groups-and-envs-3.ks.in      |  34 ++++
>   tests/kickstart_tests/hostname.ks                  |  38 -----
>   tests/kickstart_tests/hostname.ks.in               |  38 +++++
>   tests/kickstart_tests/ignoredisk.ks                |  51 ------
>   tests/kickstart_tests/ignoredisk.ks.in             |  51 ++++++
>   tests/kickstart_tests/keyboard-addtnl.ks           |  42 -----
>   tests/kickstart_tests/keyboard-addtnl.ks.in        |  42 +++++
>   tests/kickstart_tests/keyboard.ks                  |  33 ----
>   tests/kickstart_tests/keyboard.ks.in               |  33 ++++
>   tests/kickstart_tests/ks-include.ks                |  20 ---
>   tests/kickstart_tests/ks-include.ks.in             |  20 +++
>   tests/kickstart_tests/lang-2.ks                    |  43 -----
>   tests/kickstart_tests/lang-2.ks.in                 |  43 +++++
>   tests/kickstart_tests/lang.ks                      |  33 ----
>   tests/kickstart_tests/lang.ks.in                   |  33 ++++
>   tests/kickstart_tests/liveimg.ks                   |  28 ----
>   tests/kickstart_tests/liveimg.ks.in                |  28 ++++
>   tests/kickstart_tests/lvm-1.ks                     |  77 ---------
>   tests/kickstart_tests/lvm-1.ks.in                  |  77 +++++++++
>   tests/kickstart_tests/lvm-2.ks                     |  44 ------
>   tests/kickstart_tests/lvm-2.ks.in                  |  44 ++++++
>   tests/kickstart_tests/lvm-cache-1.ks               | 173 ---------------------
>   tests/kickstart_tests/lvm-cache-1.ks.in            | 173 +++++++++++++++++++++
>   tests/kickstart_tests/lvm-cache-2.ks               | 158 -------------------
>   tests/kickstart_tests/lvm-cache-2.ks.in            | 158 +++++++++++++++++++
>   tests/kickstart_tests/lvm-raid-1.ks                |  81 ----------
>   tests/kickstart_tests/lvm-raid-1.ks.in             |  81 ++++++++++
>   tests/kickstart_tests/lvm-thinp-1.ks               | 106 -------------
>   tests/kickstart_tests/lvm-thinp-1.ks.in            | 106 +++++++++++++
>   tests/kickstart_tests/lvm-thinp-2.ks               | 114 --------------
>   tests/kickstart_tests/lvm-thinp-2.ks.in            | 114 ++++++++++++++
>   tests/kickstart_tests/nfs-repo-and-addon.ks        | 106 -------------
>   tests/kickstart_tests/nfs-repo-and-addon.ks.in     | 106 +++++++++++++
>   tests/kickstart_tests/ntp-pools.ks                 |  38 -----
>   tests/kickstart_tests/ntp-pools.ks.in              |  38 +++++
>   tests/kickstart_tests/packages-and-groups-1.ks     |  73 ---------
>   tests/kickstart_tests/packages-and-groups-1.ks.in  |  73 +++++++++
>   tests/kickstart_tests/packages-default.ks          |  27 ----
>   tests/kickstart_tests/packages-default.ks.in       |  27 ++++
>   tests/kickstart_tests/packages-excludedocs.ks      |  48 ------
>   tests/kickstart_tests/packages-excludedocs.ks.in   |  48 ++++++
>   tests/kickstart_tests/packages-ignoremissing.ks    |  24 ---
>   tests/kickstart_tests/packages-ignoremissing.ks.in |  24 +++
>   tests/kickstart_tests/packages-multilib.ks         |  34 ----
>   tests/kickstart_tests/packages-multilib.ks.in      |  34 ++++
>   tests/kickstart_tests/pre-install.ks               |  64 --------
>   tests/kickstart_tests/pre-install.ks.in            |  64 ++++++++
>   tests/kickstart_tests/proxy-auth.ks                |  87 -----------
>   tests/kickstart_tests/proxy-auth.ks.in             |  87 +++++++++++
>   tests/kickstart_tests/proxy-cmdline.ks             |  41 -----
>   tests/kickstart_tests/proxy-cmdline.ks.in          |  41 +++++
>   tests/kickstart_tests/proxy-kickstart.ks           |  82 ----------
>   tests/kickstart_tests/proxy-kickstart.ks.in        |  82 ++++++++++
>   tests/kickstart_tests/raid-1.ks                    | 108 -------------
>   tests/kickstart_tests/raid-1.ks.in                 | 108 +++++++++++++
>   tests/kickstart_tests/reqpart.ks                   |  41 -----
>   tests/kickstart_tests/reqpart.ks.in                |  41 +++++
>   tests/kickstart_tests/rootpw.ks                    |  50 ------
>   tests/kickstart_tests/rootpw.ks.in                 |  50 ++++++
>   tests/kickstart_tests/selinux-disabled.ks          |  35 -----
>   tests/kickstart_tests/selinux-disabled.ks.in       |  35 +++++
>   tests/kickstart_tests/selinux-enforcing.ks         |  35 -----
>   tests/kickstart_tests/selinux-enforcing.ks.in      |  35 +++++
>   tests/kickstart_tests/selinux-permissive.ks        |  35 -----
>   tests/kickstart_tests/selinux-permissive.ks.in     |  35 +++++
>   tests/kickstart_tests/services.ks                  |  56 -------
>   tests/kickstart_tests/services.ks.in               |  56 +++++++
>   tests/kickstart_tests/timezoneLOCAL.ks             |  39 -----
>   tests/kickstart_tests/timezoneLOCAL.ks.in          |  39 +++++
>   tests/kickstart_tests/timezoneUTC.ks               |  39 -----
>   tests/kickstart_tests/timezoneUTC.ks.in            |  39 +++++
>   tests/kickstart_tests/tmpfs-fixed_size.ks          |  49 ------
>   tests/kickstart_tests/tmpfs-fixed_size.ks.in       |  49 ++++++
>   tests/kickstart_tests/user.ks                      | 113 --------------
>   tests/kickstart_tests/user.ks.in                   | 113 ++++++++++++++
>   tests/kickstart_tests/vlan.ks                      |  57 -------
>   tests/kickstart_tests/vlan.ks.in                   |  57 +++++++
>   103 files changed, 2956 insertions(+), 2956 deletions(-)
>   delete mode 100644 tests/kickstart_tests/basic-ftp.ks
>   create mode 100644 tests/kickstart_tests/basic-ftp.ks.in
>   delete mode 100644 tests/kickstart_tests/basic-ostree.ks
>   create mode 100644 tests/kickstart_tests/basic-ostree.ks.in
>   delete mode 100644 tests/kickstart_tests/bond.ks
>   create mode 100644 tests/kickstart_tests/bond.ks.in
>   delete mode 100644 tests/kickstart_tests/btrfs-1.ks
>   create mode 100644 tests/kickstart_tests/btrfs-1.ks.in
>   delete mode 100644 tests/kickstart_tests/btrfs-2.ks
>   create mode 100644 tests/kickstart_tests/btrfs-2.ks.in
>   delete mode 100644 tests/kickstart_tests/default-fstype.ks
>   create mode 100644 tests/kickstart_tests/default-fstype.ks.in
>   delete mode 100644 tests/kickstart_tests/driverdisk-disk.ks
>   create mode 100644 tests/kickstart_tests/driverdisk-disk.ks.in
>   delete mode 100644 tests/kickstart_tests/encrypt-device.ks
>   create mode 100644 tests/kickstart_tests/encrypt-device.ks.in
>   delete mode 100644 tests/kickstart_tests/escrow-cert.ks
>   create mode 100644 tests/kickstart_tests/escrow-cert.ks.in
>   delete mode 100644 tests/kickstart_tests/firewall.ks
>   create mode 100644 tests/kickstart_tests/firewall.ks.in
>   delete mode 100644 tests/kickstart_tests/groups-and-envs-1.ks
>   create mode 100644 tests/kickstart_tests/groups-and-envs-1.ks.in
>   delete mode 100644 tests/kickstart_tests/groups-and-envs-2.ks
>   create mode 100644 tests/kickstart_tests/groups-and-envs-2.ks.in
>   delete mode 100644 tests/kickstart_tests/groups-and-envs-3.ks
>   create mode 100644 tests/kickstart_tests/groups-and-envs-3.ks.in
>   delete mode 100644 tests/kickstart_tests/hostname.ks
>   create mode 100644 tests/kickstart_tests/hostname.ks.in
>   delete mode 100644 tests/kickstart_tests/ignoredisk.ks
>   create mode 100644 tests/kickstart_tests/ignoredisk.ks.in
>   delete mode 100644 tests/kickstart_tests/keyboard-addtnl.ks
>   create mode 100644 tests/kickstart_tests/keyboard-addtnl.ks.in
>   delete mode 100644 tests/kickstart_tests/keyboard.ks
>   create mode 100644 tests/kickstart_tests/keyboard.ks.in
>   delete mode 100644 tests/kickstart_tests/ks-include.ks
>   create mode 100644 tests/kickstart_tests/ks-include.ks.in
>   delete mode 100644 tests/kickstart_tests/lang-2.ks
>   create mode 100644 tests/kickstart_tests/lang-2.ks.in
>   delete mode 100644 tests/kickstart_tests/lang.ks
>   create mode 100644 tests/kickstart_tests/lang.ks.in
>   delete mode 100644 tests/kickstart_tests/liveimg.ks
>   create mode 100644 tests/kickstart_tests/liveimg.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-1.ks
>   create mode 100644 tests/kickstart_tests/lvm-1.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-2.ks
>   create mode 100644 tests/kickstart_tests/lvm-2.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-cache-1.ks
>   create mode 100644 tests/kickstart_tests/lvm-cache-1.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-cache-2.ks
>   create mode 100644 tests/kickstart_tests/lvm-cache-2.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-raid-1.ks
>   create mode 100644 tests/kickstart_tests/lvm-raid-1.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-thinp-1.ks
>   create mode 100644 tests/kickstart_tests/lvm-thinp-1.ks.in
>   delete mode 100644 tests/kickstart_tests/lvm-thinp-2.ks
>   create mode 100644 tests/kickstart_tests/lvm-thinp-2.ks.in
>   delete mode 100644 tests/kickstart_tests/nfs-repo-and-addon.ks
>   create mode 100644 tests/kickstart_tests/nfs-repo-and-addon.ks.in
>   delete mode 100644 tests/kickstart_tests/ntp-pools.ks
>   create mode 100644 tests/kickstart_tests/ntp-pools.ks.in
>   delete mode 100644 tests/kickstart_tests/packages-and-groups-1.ks
>   create mode 100644 tests/kickstart_tests/packages-and-groups-1.ks.in
>   delete mode 100644 tests/kickstart_tests/packages-default.ks
>   create mode 100644 tests/kickstart_tests/packages-default.ks.in
>   delete mode 100644 tests/kickstart_tests/packages-excludedocs.ks
>   create mode 100644 tests/kickstart_tests/packages-excludedocs.ks.in
>   delete mode 100644 tests/kickstart_tests/packages-ignoremissing.ks
>   create mode 100644 tests/kickstart_tests/packages-ignoremissing.ks.in
>   delete mode 100644 tests/kickstart_tests/packages-multilib.ks
>   create mode 100644 tests/kickstart_tests/packages-multilib.ks.in
>   delete mode 100644 tests/kickstart_tests/pre-install.ks
>   create mode 100644 tests/kickstart_tests/pre-install.ks.in
>   delete mode 100644 tests/kickstart_tests/proxy-auth.ks
>   create mode 100644 tests/kickstart_tests/proxy-auth.ks.in
>   delete mode 100644 tests/kickstart_tests/proxy-cmdline.ks
>   create mode 100644 tests/kickstart_tests/proxy-cmdline.ks.in
>   delete mode 100644 tests/kickstart_tests/proxy-kickstart.ks
>   create mode 100644 tests/kickstart_tests/proxy-kickstart.ks.in
>   delete mode 100644 tests/kickstart_tests/raid-1.ks
>   create mode 100644 tests/kickstart_tests/raid-1.ks.in
>   delete mode 100644 tests/kickstart_tests/reqpart.ks
>   create mode 100644 tests/kickstart_tests/reqpart.ks.in
>   delete mode 100644 tests/kickstart_tests/rootpw.ks
>   create mode 100644 tests/kickstart_tests/rootpw.ks.in
>   delete mode 100644 tests/kickstart_tests/selinux-disabled.ks
>   create mode 100644 tests/kickstart_tests/selinux-disabled.ks.in
>   delete mode 100644 tests/kickstart_tests/selinux-enforcing.ks
>   create mode 100644 tests/kickstart_tests/selinux-enforcing.ks.in
>   delete mode 100644 tests/kickstart_tests/selinux-permissive.ks
>   create mode 100644 tests/kickstart_tests/selinux-permissive.ks.in
>   delete mode 100644 tests/kickstart_tests/services.ks
>   create mode 100644 tests/kickstart_tests/services.ks.in
>   delete mode 100644 tests/kickstart_tests/timezoneLOCAL.ks
>   create mode 100644 tests/kickstart_tests/timezoneLOCAL.ks.in
>   delete mode 100644 tests/kickstart_tests/timezoneUTC.ks
>   create mode 100644 tests/kickstart_tests/timezoneUTC.ks.in
>   delete mode 100644 tests/kickstart_tests/tmpfs-fixed_size.ks
>   create mode 100644 tests/kickstart_tests/tmpfs-fixed_size.ks.in
>   delete mode 100644 tests/kickstart_tests/user.ks
>   create mode 100644 tests/kickstart_tests/user.ks.in
>   delete mode 100644 tests/kickstart_tests/vlan.ks
>   create mode 100644 tests/kickstart_tests/vlan.ks.in
>
>



I'm mostly ok with more shell magic as long as it stays pretty easy to 
create and run kickstart tests. For running, I think it would be helpful 
to have a check for whether all the substitutions succeeded or not, so 
that the test fails during setup and not partway through an install when 
it fails to download from --url=@KSTEST_FORGOTTEN_VARIABLE@

Something like:

diff --git a/tests/kickstart_tests/scripts/run_kickstart_tests.sh 
b/tests/kickstart_tests/scripts/run_kickstart_tests.sh
index 9664d6f..c71695a 100755
--- a/tests/kickstart_tests/scripts/run_kickstart_tests.sh
+++ b/tests/kickstart_tests/scripts/run_kickstart_tests.sh
@@ -150,6 +150,13 @@ fi
  for t in ${tests}; do
      ks=${t/.sh/.ks.in}
      sed ${sed_args} ${ks} > ${t/.sh/.ks}
+
+    # Check that all substitutions were performed
+    unmatched="$(grep -o '@[^[:space:]]*@' ${t/.sh/.ks})"
+    if [ -n "$unmatched" ]; then
+        echo "Unsubstituted patterns in kickstart: $unmatched"
+        exit 99
+    fi
  done

  if [[ "$TEST_REMOTES" != "" ]]; then



More information about the anaconda-patches mailing list