From 3d3432516f91960d743bc6a02abb397e973e0b2a Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Mon, 17 Jan 2022 14:27:52 -0600 Subject: [PATCH] Distinguish tests of templates --- test/test_unit_template_esh.py | 28 ++++++++++++++-------------- test/test_unit_template_j2.py | 31 +++++++++++++++++-------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/test/test_unit_template_esh.py b/test/test_unit_template_esh.py index d4adc70..f8249a6 100644 --- a/test/test_unit_template_esh.py +++ b/test/test_unit_template_esh.py @@ -23,7 +23,7 @@ esh distro_family = ><%=$YADM_DISTRO_FAMILY%>< wrong class 1 <% fi -%> <% if [ "$YADM_CLASS" = "{LOCAL_CLASS}" ]; then -%> -Included section for class = <%=$YADM_CLASS%> (<%=$YADM_CLASS%> repeated) +Included esh section for class = <%=$YADM_CLASS%> (<%=$YADM_CLASS%> repeated) <% fi -%> <% if [ "$YADM_CLASS" = "wrongclass2" ]; then -%> wrong class 2 @@ -32,7 +32,7 @@ wrong class 2 wrong arch 1 <% fi -%> <% if [ "$YADM_ARCH" = "{LOCAL_ARCH}" ]; then -%> -Included section for arch = <%=$YADM_ARCH%> (<%=$YADM_ARCH%> repeated) +Included esh section for arch = <%=$YADM_ARCH%> (<%=$YADM_ARCH%> repeated) <% fi -%> <% if [ "$YADM_ARCH" = "wrongarch2" ]; then -%> wrong arch 2 @@ -41,7 +41,7 @@ wrong arch 2 wrong os 1 <% fi -%> <% if [ "$YADM_OS" = "{LOCAL_SYSTEM}" ]; then -%> -Included section for os = <%=$YADM_OS%> (<%=$YADM_OS%> repeated) +Included esh section for os = <%=$YADM_OS%> (<%=$YADM_OS%> repeated) <% fi -%> <% if [ "$YADM_OS" = "wrongos2" ]; then -%> wrong os 2 @@ -50,7 +50,7 @@ wrong os 2 wrong host 1 <% fi -%> <% if [ "$YADM_HOSTNAME" = "{LOCAL_HOST}" ]; then -%> -Included section for host = <%=$YADM_HOSTNAME%> (<%=$YADM_HOSTNAME%> again) +Included esh section for host = <%=$YADM_HOSTNAME%> (<%=$YADM_HOSTNAME%> again) <% fi -%> <% if [ "$YADM_HOSTNAME" = "wronghost2" ]; then -%> wrong host 2 @@ -59,7 +59,7 @@ wrong host 2 wrong user 1 <% fi -%> <% if [ "$YADM_USER" = "{LOCAL_USER}" ]; then -%> -Included section for user = <%=$YADM_USER%> (<%=$YADM_USER%> repeated) +Included esh section for user = <%=$YADM_USER%> (<%=$YADM_USER%> repeated) <% fi -%> <% if [ "$YADM_USER" = "wronguser2" ]; then -%> wrong user 2 @@ -68,7 +68,7 @@ wrong user 2 wrong distro 1 <% fi -%> <% if [ "$YADM_DISTRO" = "{LOCAL_DISTRO}" ]; then -%> -Included section for distro = <%=$YADM_DISTRO%> (<%=$YADM_DISTRO%> again) +Included esh section for distro = <%=$YADM_DISTRO%> (<%=$YADM_DISTRO%> again) <% fi -%> <% if [ "$YADM_DISTRO" = "wrongdistro2" ]; then -%> wrong distro 2 @@ -77,7 +77,7 @@ wrong distro 2 wrong family 1 <% fi -%> <% if [ "$YADM_DISTRO_FAMILY" = "{LOCAL_DISTRO_FAMILY}" ]; then -%> -Included section for distro_family = \ +Included esh section for distro_family = \ <%=$YADM_DISTRO_FAMILY%> (<%=$YADM_DISTRO_FAMILY%> again) <% fi -%> <% if [ "$YADM_DISTRO" = "wrongfamily2" ]; then -%> @@ -94,13 +94,13 @@ esh host = >{LOCAL_HOST}< esh user = >{LOCAL_USER}< esh distro = >{LOCAL_DISTRO}< esh distro_family = >{LOCAL_DISTRO_FAMILY}< -Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated) -Included section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated) -Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated) -Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again) -Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated) -Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again) -Included section for distro_family = \ +Included esh section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated) +Included esh section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated) +Included esh section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated) +Included esh section for host = {LOCAL_HOST} ({LOCAL_HOST} again) +Included esh section for user = {LOCAL_USER} ({LOCAL_USER} repeated) +Included esh section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again) +Included esh section for distro_family = \ {LOCAL_DISTRO_FAMILY} ({LOCAL_DISTRO_FAMILY} again) end of template ''' diff --git a/test/test_unit_template_j2.py b/test/test_unit_template_j2.py index 7429f8d..3cfe9df 100644 --- a/test/test_unit_template_j2.py +++ b/test/test_unit_template_j2.py @@ -24,7 +24,8 @@ j2 distro_family = >{{{{YADM_DISTRO_FAMILY}}}}< wrong class 1 {{%- endif %}} {{%- if YADM_CLASS == "{LOCAL_CLASS}" %}} -Included section for class = {{{{YADM_CLASS}}}} ({{{{YADM_CLASS}}}} repeated) +Included j2 section for class = \ +{{{{YADM_CLASS}}}} ({{{{YADM_CLASS}}}} repeated) {{%- endif %}} {{%- if YADM_CLASS == "wrongclass2" %}} wrong class 2 @@ -33,7 +34,7 @@ wrong class 2 wrong arch 1 {{%- endif %}} {{%- if YADM_ARCH == "{LOCAL_ARCH}" %}} -Included section for arch = {{{{YADM_ARCH}}}} ({{{{YADM_ARCH}}}} repeated) +Included j2 section for arch = {{{{YADM_ARCH}}}} ({{{{YADM_ARCH}}}} repeated) {{%- endif %}} {{%- if YADM_ARCH == "wrongarch2" %}} wrong arch 2 @@ -42,7 +43,7 @@ wrong arch 2 wrong os 1 {{%- endif %}} {{%- if YADM_OS == "{LOCAL_SYSTEM}" %}} -Included section for os = {{{{YADM_OS}}}} ({{{{YADM_OS}}}} repeated) +Included j2 section for os = {{{{YADM_OS}}}} ({{{{YADM_OS}}}} repeated) {{%- endif %}} {{%- if YADM_OS == "wrongos2" %}} wrong os 2 @@ -51,7 +52,8 @@ wrong os 2 wrong host 1 {{%- endif %}} {{%- if YADM_HOSTNAME == "{LOCAL_HOST}" %}} -Included section for host = {{{{YADM_HOSTNAME}}}} ({{{{YADM_HOSTNAME}}}} again) +Included j2 section for host = \ +{{{{YADM_HOSTNAME}}}} ({{{{YADM_HOSTNAME}}}} again) {{%- endif %}} {{%- if YADM_HOSTNAME == "wronghost2" %}} wrong host 2 @@ -60,7 +62,7 @@ wrong host 2 wrong user 1 {{%- endif %}} {{%- if YADM_USER == "{LOCAL_USER}" %}} -Included section for user = {{{{YADM_USER}}}} ({{{{YADM_USER}}}} repeated) +Included j2 section for user = {{{{YADM_USER}}}} ({{{{YADM_USER}}}} repeated) {{%- endif %}} {{%- if YADM_USER == "wronguser2" %}} wrong user 2 @@ -69,7 +71,8 @@ wrong user 2 wrong distro 1 {{%- endif %}} {{%- if YADM_DISTRO == "{LOCAL_DISTRO}" %}} -Included section for distro = {{{{YADM_DISTRO}}}} ({{{{YADM_DISTRO}}}} again) +Included j2 section for distro = \ +{{{{YADM_DISTRO}}}} ({{{{YADM_DISTRO}}}} again) {{%- endif %}} {{%- if YADM_DISTRO == "wrongdistro2" %}} wrong distro 2 @@ -78,7 +81,7 @@ wrong distro 2 wrong family 1 {{%- endif %}} {{%- if YADM_DISTRO_FAMILY == "{LOCAL_DISTRO_FAMILY}" %}} -Included section for distro_family = \ +Included j2 section for distro_family = \ {{{{YADM_DISTRO_FAMILY}}}} ({{{{YADM_DISTRO_FAMILY}}}} again) {{%- endif %}} {{%- if YADM_DISTRO_FAMILY == "wrongfamily2" %}} @@ -95,13 +98,13 @@ j2 host = >{LOCAL_HOST}< j2 user = >{LOCAL_USER}< j2 distro = >{LOCAL_DISTRO}< j2 distro_family = >{LOCAL_DISTRO_FAMILY}< -Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated) -Included section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated) -Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated) -Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again) -Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated) -Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again) -Included section for distro_family = \ +Included j2 section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated) +Included j2 section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated) +Included j2 section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated) +Included j2 section for host = {LOCAL_HOST} ({LOCAL_HOST} again) +Included j2 section for user = {LOCAL_USER} ({LOCAL_USER} repeated) +Included j2 section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again) +Included j2 section for distro_family = \ {LOCAL_DISTRO_FAMILY} ({LOCAL_DISTRO_FAMILY} again) end of template '''