From: y0169.zhang <y0169.zhang@samsung.com>
Date: Sat, 17 Dec 2016 09:22:15 +0000 (+0900)
Subject: Fix git status info in Ubuntu16.10
X-Git-Tag: submit/devel/20190730.074552~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=940683076bb0bb67b586bc008059a6845340d19c;p=tools%2Fitest-cases-gbs.git

Fix git status info in Ubuntu16.10

Change-Id: I4557176eefa9a4e4b3383ef959230f766d050e7b
---

diff --git a/cases/build/test_build_arch_compatible_with_spec.case b/cases/build/test_build_arch_compatible_with_spec.case
index 9225a8c..b9d8b61 100644
--- a/cases/build/test_build_arch_compatible_with_spec.case
+++ b/cases/build/test_build_arch_compatible_with_spec.case
@@ -22,6 +22,6 @@ test -n "`grep "build arch not compatible" log`"
 test -n "`grep ".*no available packages to build" log`"
 
 #check source package not changed
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 ]]></steps>
 </testcase>
diff --git a/cases/build/test_build_commit_ia32_negative.case b/cases/build/test_build_commit_ia32_negative.case
index 2a317e6..24f28c6 100644
--- a/cases/build/test_build_commit_ia32_negative.case
+++ b/cases/build/test_build_commit_ia32_negative.case
@@ -21,7 +21,7 @@ cd ..
 
 (! grep "mount:.*scratch" log)
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 grep "error:.*multiple packages" log
 ]]></steps>
diff --git a/cases/build/test_build_configure_exlude_packages_in_profile_section.case b/cases/build/test_build_configure_exlude_packages_in_profile_section.case
index b2706ee..8b45bcd 100644
--- a/cases/build/test_build_configure_exlude_packages_in_profile_section.case
+++ b/cases/build/test_build_configure_exlude_packages_in_profile_section.case
@@ -23,11 +23,11 @@ sed -i "/\[profile.tizen\]/a exclude_packages=fake, fake-dev" base.cfg
 
 gbs -c base.cfg build -A i586 | tee log
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd power && test -n "`git status | grep "working directory clean"`" && cd ..
+cd power && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -z "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
 
diff --git a/cases/build/test_build_dist_negative_ia32.case b/cases/build/test_build_dist_negative_ia32.case
index 0cca8c6..beb2d89 100644
--- a/cases/build/test_build_dist_negative_ia32.case
+++ b/cases/build/test_build_dist_negative_ia32.case
@@ -20,6 +20,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/*scratch*0*
 
 test -z "`grep "mount:.*scratch" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 ]]></steps>
 </testcase>
diff --git a/cases/build/test_build_fallback-to-native_with_no_tag.case b/cases/build/test_build_fallback-to-native_with_no_tag.case
index 9e32b15..084ee09 100644
--- a/cases/build/test_build_fallback-to-native_with_no_tag.case
+++ b/cases/build/test_build_fallback-to-native_with_no_tag.case
@@ -25,7 +25,7 @@ git tag | grep upstream/0.1
 gbs -c ../base.cfg build -A i586 2>&1 | tee ../log1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
@@ -51,7 +51,7 @@ gbs -c ../base.cfg build -A i586 --fallback-to-native --clean --clean-repos 2>&1
 # Check that build has been finished sucessful.
 grep -i "Falling back to native, i.e. creating source archive directly from exported commit, without any patches" ../log3
 
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
diff --git a/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case b/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
index bb7c78c..4dde22a 100644
--- a/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
+++ b/cases/build/test_build_fallback-to-native_with_non-default_gbs_configuration.case
@@ -25,7 +25,7 @@ git tag | grep upstream/0.1
 gbs -c ../base.cfg build -A i586 2>&1 | tee ../log1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
@@ -54,7 +54,7 @@ gbs -c ../base.cfg build -A i586 --clean --clean-repos 2>&1 | tee ../log3
 # Check that build has been finished sucessful.
 grep -i "Falling back to native, i.e. creating source archive directly from exported commit, without any patches" ../log3
 
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
diff --git a/cases/build/test_build_keep-packs_arm.case b/cases/build/test_build_keep-packs_arm.case
index 70a7385..2fac9bd 100644
--- a/cases/build/test_build_keep-packs_arm.case
+++ b/cases/build/test_build_keep-packs_arm.case
@@ -29,7 +29,7 @@ test -z "`grep "deleting.*" log`"
 
 test -n "`grep "init_buildsystem.*keep-packs" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*xorg-x11-filesystem*.rpm"`"
 
diff --git a/cases/build/test_build_keep-packs_ia32.case b/cases/build/test_build_keep-packs_ia32.case
index d8c74da..54bf0b0 100644
--- a/cases/build/test_build_keep-packs_ia32.case
+++ b/cases/build/test_build_keep-packs_ia32.case
@@ -29,7 +29,7 @@ test -z "`grep "deleting.*" log`"
 
 test -n "`grep "init_buildsystem.*keep-packs" log`"
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*xorg-x11-filesystem*.rpm"`"
 
diff --git a/cases/build/test_build_multi-pkgs_with_noinit.case b/cases/build/test_build_multi-pkgs_with_noinit.case
index ac398e2..0b247ad 100644
--- a/cases/build/test_build_multi-pkgs_with_noinit.case
+++ b/cases/build/test_build_multi-pkgs_with_noinit.case
@@ -23,11 +23,11 @@ gbs -c base.cfg build --clean fake -A i586
 
 (! gbs -c base.cfg build --noinit -A i586 2>&1 | tee log)
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd power && test -n "`git status | grep "working directory clean"`" && cd ..
+cd power && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
-cd xorg-x11-filesystem && test -n "`git status | grep "working directory clean"`" && cd ..
+cd xorg-x11-filesystem && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 grep "\--noinit build only support building one package" log
 
diff --git a/cases/build/test_build_noinit_clean-once_ia32.case b/cases/build/test_build_noinit_clean-once_ia32.case
index 50f23e8..db47166 100644
--- a/cases/build/test_build_noinit_clean-once_ia32.case
+++ b/cases/build/test_build_noinit_clean-once_ia32.case
@@ -14,7 +14,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*noinit.*clean-once" log`"
 ]]></steps>
diff --git a/cases/build/test_build_noinit_clean_ia32.case b/cases/build/test_build_noinit_clean_ia32.case
index 055f3fa..315cb1c 100644
--- a/cases/build/test_build_noinit_clean_ia32.case
+++ b/cases/build/test_build_noinit_clean_ia32.case
@@ -14,7 +14,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*noinit.*clean" log`"
 ]]></steps>
diff --git a/cases/build/test_build_noinit_without_buildroot.case b/cases/build/test_build_noinit_without_buildroot.case
index 17afaee..2ad75fe 100644
--- a/cases/build/test_build_noinit_without_buildroot.case
+++ b/cases/build/test_build_noinit_without_buildroot.case
@@ -14,6 +14,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/scratch.i*
 
 grep "build root:.* does not exist\. Please build without --noinit first" log
 
-cd fake && test -n "`git status | grep "working directory clean"`" && cd ..
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 ]]></steps>
 </testcase>
diff --git a/cases/build/test_build_noinit_without_buildroot_ia32.case b/cases/build/test_build_noinit_without_buildroot_ia32.case
index 122197a..b3b25d7 100644
--- a/cases/build/test_build_noinit_without_buildroot_ia32.case
+++ b/cases/build/test_build_noinit_without_buildroot_ia32.case
@@ -16,7 +16,7 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/BUILD-ROOTS/scratch*i586*
 
 test -z "`grep "generate repositories" log`"
 
-cd sw-tools && test -n "`git status | grep "working directory clean"`" && cd ..
+cd sw-tools && test -n "`git status | grep -E "working tree|directory clean"`" && cd ..
 
 test -n "`grep "error.*scratch.*does not exist" log`"
 ]]></steps>
diff --git a/cases/build/test_build_on_develop_branch.case b/cases/build/test_build_on_develop_branch.case
index 1cf2862..b1183c2 100644
--- a/cases/build/test_build_on_develop_branch.case
+++ b/cases/build/test_build_on_develop_branch.case
@@ -26,7 +26,7 @@ test -n "`git branch | grep "development"`"
 gbs -c ../base.cfg build -A i586 2>&1
 
 # Check successfully build result.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 
diff --git a/cases/build/test_build_on_orphan_branch.case b/cases/build/test_build_on_orphan_branch.case
index eab9564..a2a57aa 100644
--- a/cases/build/test_build_on_orphan_branch.case
+++ b/cases/build/test_build_on_orphan_branch.case
@@ -44,7 +44,7 @@ git commit -m "add all changes"
 gbs -c ../base.cfg build -A i586 2>&1
 
 # Check that build has been finished sucessful.
-test -n "`git status | grep "working directory clean"`"
+test -n "`git status | grep -E "working tree|directory clean"`"
 
 test -n "`find ~/GBS-ROOT/local/repos -name "*sw-tools*.rpm"`"
 ]]></steps>
diff --git a/cases/build/test_build_packaging-dir_ia32.case b/cases/build/test_build_packaging-dir_ia32.case
index 6334ac6..6eb5055 100644
--- a/cases/build/test_build_packaging-dir_ia32.case
+++ b/cases/build/test_build_packaging-dir_ia32.case
@@ -31,7 +31,7 @@ cd ..
 test -n "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
diff --git a/cases/build/test_build_packaging-dir_multispec_ia32.case b/cases/build/test_build_packaging-dir_multispec_ia32.case
index 7bd83b2..a7be854 100644
--- a/cases/build/test_build_packaging-dir_multispec_ia32.case
+++ b/cases/build/test_build_packaging-dir_multispec_ia32.case
@@ -24,7 +24,7 @@ test -n "`grep "init_buildsystem.*fake.spec" log`"
 test -n "`grep "init_buildsystem.*fake-lib.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
diff --git a/cases/build/test_build_packaging-dir_spec_ia32.case b/cases/build/test_build_packaging-dir_spec_ia32.case
index 87ba671..0657b01 100644
--- a/cases/build/test_build_packaging-dir_spec_ia32.case
+++ b/cases/build/test_build_packaging-dir_spec_ia32.case
@@ -24,7 +24,7 @@ test -n "`grep "init_buildsystem.*fake-dev.spec" log`"
 test -z "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
diff --git a/cases/build/test_build_spec_ia32.case b/cases/build/test_build_spec_ia32.case
index 84182dd..0b68e37 100644
--- a/cases/build/test_build_spec_ia32.case
+++ b/cases/build/test_build_spec_ia32.case
@@ -28,7 +28,7 @@ test -n "`grep "init_buildsystem.*fake-dev.spec" log`"
 test -z "`grep "init_buildsystem.*fake.spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 
 #check rpm generated whether or not
 test -n "`find ~/GBS-ROOT/local/repos -name "*fake*.rpm"`"
diff --git a/cases/build/test_build_spec_negative.case b/cases/build/test_build_spec_negative.case
index 7d47290..63756cd 100644
--- a/cases/build/test_build_spec_negative.case
+++ b/cases/build/test_build_spec_negative.case
@@ -20,6 +20,6 @@ sudo /bin/rm -rf ~/GBS-ROOT/local/repos
 test -n "`grep "gbs build.*error.*argument --spec" log`"
 
 #check source package whether changed or not
-cd fake && test -n "`git status | grep "working directory clean"`"
+cd fake && test -n "`git status | grep -E "working tree|directory clean"`"
 ]]></steps>
 </testcase>
diff --git a/fixtures/tools/assert b/fixtures/tools/assert
index 28234fc..82f249e 100644
--- a/fixtures/tools/assert
+++ b/fixtures/tools/assert
@@ -14,13 +14,13 @@ GBS_LOCAL_REPOS=~/GBS-ROOT/local/repos
 #assert git packages under current dir are clean
 function AssertClean()
 {
-    find . -maxdepth 1 -type d| sed "1d"| xargs -i sh -c "cd {};git status| grep 'working directory clean'"
+    find . -maxdepth 1 -type d| sed "1d"| xargs -i sh -c "cd {};git status| grep -E 'working tree|directory clean'"
 }
 #assert git package clean
 # such as: AssertCleanWith fake sw-tools
 function AssertCleanWith()
 {
-    echo $*| xargs -n1| xargs -i sh -c "cd {} && git status| grep 'working directory clean'"
+    echo $*| xargs -n1| xargs -i sh -c "cd {} && git status| grep -E 'working tree|directory clean'"
 }
 
 function AssertRPMsI()