From 705396eab10021bd5fb5d4cfbcda466d76e282bc Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Sun, 11 Nov 2012 23:41:11 +0100
Subject: [PATCH] tests: fix the color tags used in the final messages

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog                   | 6 ++++++
 po/it/test00_specsyntax.po  | 4 ++--
 po/it/test01_pkgquality.po  | 5 +++--
 po/it/test02_pkgsecurity.po | 4 ++--
 tests/test00_specsyntax.in  | 4 ++--
 tests/test01_pkgquality.in  | 4 ++--
 tests/test02_pkgsecurity.in | 4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b45609..0c44b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,12 @@ Changes in version 1.14.2
   * italian manpage - Davide Madrisan:
   Update italian manpage and document new extensions.
 
++ bugfix
+  * tests/* - Davide Madrisan:
+  Fix the color tags of the final message in each test module; they worked for
+  teminal colors but not for the web scheme.
+  (Bug discovered by Silvan Calarco)
+
 -------------------------------------------------------------------------------
 
 Changes in version 1.14.1 - _TO*Hacklab release
diff --git a/po/it/test00_specsyntax.po b/po/it/test00_specsyntax.po
index 5444b69..375605f 100644
--- a/po/it/test00_specsyntax.po
+++ b/po/it/test00_specsyntax.po
@@ -72,5 +72,5 @@ msgstr "Licenza valida"
 msgid "not approved \\`License'"
 msgstr "\\`License' non approvata"
 
-msgid "Specfile checks: ${WARN}$total_issues${NOTE} warning(s)."
-msgstr "Controllo dello specfile: problemi riscontrati: ${WARN}$total_issues${NOTE}"
+msgid "${NOTE}Specfile checks: ${NORM}${WARN}$total_issues${NORM} ${NOTE}warnings.${NORM}"
+msgstr "${NOTE}Controllo dello specfile: problemi riscontrati: ${NORM}${WARN}$total_issues${NORM}"
diff --git a/po/it/test01_pkgquality.po b/po/it/test01_pkgquality.po
index 6f83bbe..4894e49 100644
--- a/po/it/test01_pkgquality.po
+++ b/po/it/test01_pkgquality.po
@@ -118,5 +118,6 @@ msgstr "ricerca di pacchetti con errato tag BuildArch"
 msgid "this package should be tagged \\`noarch'"
 msgstr "questo pacchetto dovrebbe essere di tipo \\`noarch'"
 
-msgid "Quality checks: ${#rpmpkg_name[@]} package(s) checked: ${WARN}$total_issues${NOTE} warning(s)."
-msgstr "Controlli di qualità: pacchetti rpm: ${#rpmpkg_name[@]}; problemi riscontrati: ${WARN}$total_issues${NOTE}"
+msgid "${NOTE}Quality checks: ${#rpmpkg_name[@]} package(s) checked: ${NORM}${WARN}$total_issues${NORM}${NOTE} warning(s).${NORM}"
+msgstr "${NOTE}Controlli di qualità: pacchetti rpm: ${#rpmpkg_name[@]}; problemi riscontrati: ${NORM}${WARN}$total_issues${NORM}"
+
diff --git a/po/it/test02_pkgsecurity.po b/po/it/test02_pkgsecurity.po
index d9f214f..93c4f3c 100644
--- a/po/it/test02_pkgsecurity.po
+++ b/po/it/test02_pkgsecurity.po
@@ -64,5 +64,5 @@ msgstr "Suggerimento per script bash (richiede \\`mktemp')"
 msgid "Hint for perl scripts"
 msgstr "Suggerimento per script perl"
 
-msgid "Security checks: ${#rpmpkg_name[@]} package(s) checked: ${WARN}$total_issues${NOTE} warning(s)."
-msgstr "Controlli di sicurezza: pacchetti rpm: ${#rpmpkg_name[@]}; problemi riscontrati: ${WARN}$total_issues${NOTE}"
+msgid "${NOTE}Security checks: ${#rpmpkg_name[@]} package(s) checked: ${NORM}${WARN}$total_issues${NORM}${NOTE} warning(s).${NORM}"
+msgstr "${NOTE}Controlli di sicurezza: pacchetti rpm: ${#rpmpkg_name[@]}; problemi riscontrati: ${NORM}${WARN}$total_issues${NORM}"
diff --git a/tests/test00_specsyntax.in b/tests/test00_specsyntax.in
index 60f51fa..3f12af5 100644
--- a/tests/test00_specsyntax.in
+++ b/tests/test00_specsyntax.in
@@ -309,8 +309,8 @@ ${NOTE}@package@ --eval=rpm_approved_licenses${NORM}
    test_number=$(($test_number + 1))
 
    notify.note "
- --> ${NOTE}"$"Specfile checks: ${WARN}$total_issues${NOTE} warning(s).""\
-${NORM}""
+ --> "$"${NOTE}Specfile checks: ${NORM}\
+${WARN}$total_issues${NORM} ${NOTE}warnings.${NORM}""
 "
    return $total_issues
 }
diff --git a/tests/test01_pkgquality.in b/tests/test01_pkgquality.in
index 03e2e18..4b288d1 100644
--- a/tests/test01_pkgquality.in
+++ b/tests/test01_pkgquality.in
@@ -441,7 +441,7 @@ BuildArch:     noarch
    test_number=$(($test_number + 1))
 
    notify.note "
- --> ${NOTE}"$"Quality checks: ${#rpmpkg_name[@]} \
-package(s) checked: ${WARN}$total_issues${NOTE} warning(s).""${NORM}""
+ --> "$"${NOTE}Quality checks: ${#rpmpkg_name[@]} \
+package(s) checked: ${NORM}${WARN}$total_issues${NORM}${NOTE} warning(s).${NORM}""
 "
 }
diff --git a/tests/test02_pkgsecurity.in b/tests/test02_pkgsecurity.in
index f1fbe15..7c0e61e 100644
--- a/tests/test02_pkgsecurity.in
+++ b/tests/test02_pkgsecurity.in
@@ -179,7 +179,7 @@ ${NOTE}"$"Hint for perl scripts"":${NORM}
    test_number=$(($test_number + 1))
 
    notify.note "
- --> ${NOTE}"$"Security checks: ${#rpmpkg_name[@]} \
-package(s) checked: ${WARN}$total_issues${NOTE} warning(s).""${NORM}""
+ --> "$"${NOTE}Security checks: ${#rpmpkg_name[@]} \
+package(s) checked: ${NORM}${WARN}$total_issues${NORM}${NOTE} warning(s).${NORM}""
 "
 }