Fix compare error in import model:

-Change the log word 'Downstream' to 'Vendor'
-Change the log word 'packaging' to 'vendor'

Change-Id: I0276d0d9e0a2901fded09ddef080b551e6c2bede

diff --git a/cases/import/gbs_im_from_rpm_bz2.case b/cases/import/gbs_im_from_rpm_bz2.case
index fad572de5c3400c97ae756d7ad4a05ad49d13706..8486b7e9bbffadd5c2cc17265607faaa6e2fa00c 100644 (file)
--- a/cases/import/gbs_im_from_rpm_bz2.case
+++ b/cases/import/gbs_im_from_rpm_bz2.case
@@ -26,7 +26,7 @@ gbs -c base.cfg import json-c-0.9-1.src.rpm
 
 cd json-c
 
-git log | grep -i 'Imported Downstream release'
+git log | grep -i 'Imported Vendor release'
 
 git log | grep -i 'Imported Upstream version'
 
@@ -38,6 +38,6 @@ git branch | grep 'pristine-tar'
 
 git tag | grep 'upstream'
 
-git tag | grep 'packaging'
+git tag | grep 'vendor'
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_from_rpm_case.case b/cases/import/gbs_im_from_rpm_case.case
index d57c283299d5fc1b5c7d951c537f0cf3e773bcfa..b85439276580dc1c3222138edca1355bc97d02bd 100644 (file)
--- a/cases/import/gbs_im_from_rpm_case.case
+++ b/cases/import/gbs_im_from_rpm_case.case
@@ -26,7 +26,7 @@ gbs -c base.cfg import json-c-0.9-1.src.rpm
 
 cd json-c
 
-git log | grep -i 'Imported Downstream release'
+git log | grep -i 'Imported Vendor release'
 
 git log | grep -i 'Imported Upstream version'
 
@@ -38,6 +38,6 @@ git branch | grep 'pristine-tar'
 
 git tag | grep 'upstream'
 
-git tag | grep 'packaging'
+git tag | grep 'vendor'
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_from_rpm_no_pristin.case b/cases/import/gbs_im_from_rpm_no_pristin.case
index c716c8ab706611c6b1d31aa8e6fa8d7ce710bb1a..92f2c0db96045220964bec010a386e7216a5c303 100644 (file)
--- a/cases/import/gbs_im_from_rpm_no_pristin.case
+++ b/cases/import/gbs_im_from_rpm_no_pristin.case
@@ -22,7 +22,7 @@ gbs -c base.cfg import json-c-0.9-1.src.rpm --no-pristine-tar
 
 cd json-c
 
-git log | grep -i 'Imported Downstream release'
+git log | grep -i 'Imported Vendor release'
 
 git log | grep -i 'Imported Upstream version'
 
@@ -34,6 +34,6 @@ git branch | grep 'master'
 
 git tag | grep 'upstream'
 
-git tag | grep 'packaging'
+git tag | grep 'vendor'
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_from_rpm_tar.case b/cases/import/gbs_im_from_rpm_tar.case
index 19bd612573c1e0f0d20eb9b96d2c61b3d6c2714b..3c45969d1f1fad30e51992fa7242c014580236a0 100644 (file)
--- a/cases/import/gbs_im_from_rpm_tar.case
+++ b/cases/import/gbs_im_from_rpm_tar.case
@@ -26,7 +26,7 @@ gbs -c base.cfg import json-c-0.9-1.src.rpm
 
 cd json-c
 
-git log | grep -i 'Imported Downstream release'
+git log | grep -i 'Imported Vendor release'
 
 git log | grep -i 'Imported Upstream version'
 
@@ -38,6 +38,6 @@ git branch | grep 'pristine-tar'
 
 git tag | grep 'upstream'
 
-git tag | grep 'packaging'
+git tag | grep 'vendor'
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_from_rpm_xz.case b/cases/import/gbs_im_from_rpm_xz.case
index 4d6e30ed18243f36d30985ddf5dae0bb55e32dd8..d21810ff8d9ca0520917b4dd5b79a3c85b129d6e 100644 (file)
--- a/cases/import/gbs_im_from_rpm_xz.case
+++ b/cases/import/gbs_im_from_rpm_xz.case
@@ -26,7 +26,7 @@ gbs -c base.cfg import json-c-0.9-1.src.rpm
 
 cd json-c
 
-git log | grep -i 'Imported Downstream release'
+git log | grep -i 'Imported Vendor release'
 
 git log | grep -i 'Imported Upstream version'
 
@@ -38,6 +38,6 @@ git branch | grep 'pristine-tar'
 
 git tag | grep 'upstream'
 
-git tag | grep 'packaging'
+git tag | grep 'vendor'
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_from_spec_case.case b/cases/import/gbs_im_from_spec_case.case
index 54c238543d46198d258c5c715a53b33caccf516e..c615a1c740e6f48ff9e9dcb72774a6ce68404464 100644 (file)
--- a/cases/import/gbs_im_from_spec_case.case
+++ b/cases/import/gbs_im_from_spec_case.case
@@ -51,7 +51,7 @@ git branch | grep master
 
 git tag | grep upstream/0.1
 
-git tag | grep packaging/0.1-1
+git tag | grep vendor/0.1-1
 
 git log -1 | grep -i "Autoremove imported patches from packaging"
 ]]></steps>

diff --git a/cases/import/gbs_im_native.case b/cases/import/gbs_im_native.case
index 1a3e3676c6805104a9be49b3b9207cdeafe33355..55070a7e56864442bbbf92e3887b1da4d50d3ad0 100644 (file)
--- a/cases/import/gbs_im_native.case
+++ b/cases/import/gbs_im_native.case
@@ -28,6 +28,6 @@ cd fake
 test -z $(git branch | grep -v master)
 
 #no other tag
-test -z $(git tag | grep -v packaging/1.0-1)
+test -z $(git tag | grep -v vendor/1.0-1)
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_sameversion.case b/cases/import/gbs_im_sameversion.case
index 0f715c9488fc4094a3f13c87f83696cd8f8a428a..723831ecaef9308e462cc4c20b902db34c47d6ff 100644 (file)
--- a/cases/import/gbs_im_sameversion.case
+++ b/cases/import/gbs_im_sameversion.case
@@ -33,6 +33,6 @@ grep -i "Moving tag of version '1.0-1' since import forced" log2
 cd fake
 
 #old packaging/1.0-1 change to packaging/1.0-1_xxx
-git tag | grep "packaging/1.0-1_.*"
+git tag | grep "vendor/1.0-1_.*"
 ]]></steps>
 </testcase>

diff --git a/cases/import/gbs_im_upgrade_srcrpm.case b/cases/import/gbs_im_upgrade_srcrpm.case
index ac6fbed19111a62d3dcce6f17b0cf2d9053d4259..5e755f4d44dbe9cd66b990c59c232809c00e8c91 100644 (file)
--- a/cases/import/gbs_im_upgrade_srcrpm.case
+++ b/cases/import/gbs_im_upgrade_srcrpm.case
@@ -44,8 +44,8 @@ cd json-c
 
 gbs -c ../base.cfg import ../json-c-0.9-2.src.rpm
 
-git log | grep -i 'Imported Downstream release 0.9-2'
+git log | grep -i 'Imported Vendor release 0.9-2'
 
-git tag | grep 'packaging/0.9-2'
+git tag | grep 'vendor/0.9-2'
 ]]></steps>
 </testcase>