From 8695d7e347bc014665f9dc6d0af5786bb7e2a779 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Wed, 18 Mar 2020 10:13:14 +0530
Subject: [PATCH] Update CI script for new installed font path

---
 google-croscore-fonts.spec |  5 ++++-
 tests/test-simple          | 14 +++++++-------
 tests/test_simple.yml      |  9 ++++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/google-croscore-fonts.spec b/google-croscore-fonts.spec
index b5f4386..9c0c4ce 100644
--- a/google-croscore-fonts.spec
+++ b/google-croscore-fonts.spec
@@ -1,7 +1,7 @@
 BuildArch: noarch
 
 Version:        1.31.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        ASL 2.0
 #URL:            
 
@@ -109,6 +109,9 @@ echo %{fontpkgname}
 %fontfiles -a
 
 %changelog
+* Wed Mar 18 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.31.0-7
+- Update CI script for new installed font path
+
 * Tue Mar 10 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.31.0-6
 - Convert to new fonts packaging guidelines
 - Dropped Obsoletes: google-croscore-symbolneu-fonts (Added in F29)
diff --git a/tests/test-simple b/tests/test-simple
index 2dcf918..9a619e3 100644
--- a/tests/test-simple
+++ b/tests/test-simple
@@ -1,15 +1,15 @@
 #/usr/bin/bash
-aminfo=`rpm -q --provides google-croscore-arimo-fonts| grep "metainfo(google-croscore-arimo.metainfo.xml)"`
+aminfo=`rpm -q --provides google-arimo-fonts| grep "metainfo(org.fedoraproject.google-arimo-fonts.metainfo.xml)"`
 if [[ $aminfo ]];then
   echo "metainfo present for Google CrosCore Arimo font"
 fi
 
-tminfo=`rpm -q --provides google-croscore-tinos-fonts| grep "metainfo(google-croscore-tinos.metainfo.xml)"`
-if [[ $tminfo ]];then
-  echo "metainfo present for Google CrosCore Tinos font"
-fi
-
-cminfo=`rpm -q --provides google-croscore-cousine-fonts | grep "metainfo(google-croscore-cousine.metainfo.xml)"`
+cminfo=`rpm -q --provides google-cousine-fonts | grep "metainfo(org.fedoraproject.google-cousine-fonts.metainfo.xml)"`
 if [[ $cminfo ]];then
   echo "metainfo present for Google CrosCore Cousine font"
 fi
+
+tminfo=`rpm -q --provides google-tinos-fonts| grep "metainfo(org.fedoraproject.google-tinos-fonts.metainfo.xml)"`
+if [[ $tminfo ]];then
+  echo "metainfo present for Google CrosCore Tinos font"
+fi
diff --git a/tests/test_simple.yml b/tests/test_simple.yml
index 97d1172..43b94e2 100644
--- a/tests/test_simple.yml
+++ b/tests/test_simple.yml
@@ -7,8 +7,15 @@
   tasks:
   - name: Install required packages
     dnf:
-      name: google-croscore-*-fonts
+      name: google-arimo-fonts
       state: latest
+    dnf:
+      name: google-cousine-fonts
+      state: latest
+    dnf:
+      name: google-tinos-fonts
+      state: latest
+
 
   - name: Install the test files
     copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} mode=0755