simplify some testcases

diff --git a/test/testcases/forcebest/forcebest_dup.t b/test/testcases/forcebest/forcebest_dup.t
index 8de43eb0372137617fe839ccabdeb20091fb3688..7f1fbba4f2c77604f0b8244355ab6b926cbf9769 100644 (file)
--- a/test/testcases/forcebest/forcebest_dup.t
+++ b/test/testcases/forcebest/forcebest_dup.t
@@ -1,28 +1,14 @@
 repo system 0 testtags <inline>
 #>=Pkg: A 1 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>A = 1-1
-#>-Prv:
 #>=Pkg: D 1 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>D = 1-1
-#>-Prv:
-#>+Con:
-#>A = 3-1
-#>-Con:
+#>=Con: A = 3-1
 repo available 0 testtags <inline>
 #>=Pkg: A 2 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
 #>=Pkg: A 3 1 noarch
 #>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
 system i686 rpm system
 
 job distupgrade name A [forcebest]

diff --git a/test/testcases/forcebest/forcebest_in.t b/test/testcases/forcebest/forcebest_in.t
index 976ceda1331a8992faceb0b46a66e0abde989eb1..aaf2aa1db49b9f86c1913dd607eefe473eadfdb5 100644 (file)
--- a/test/testcases/forcebest/forcebest_in.t
+++ b/test/testcases/forcebest/forcebest_in.t
@@ -1,23 +1,12 @@
 repo system 0 testtags <inline>
 #>=Pkg: D 1 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>D = 1-1
-#>-Prv:
-#>+Con:
-#>A = 3-1
-#>-Con:
+#>=Con: A = 3-1
 repo available 0 testtags <inline>
 #>=Pkg: A 2 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
 #>=Pkg: A 3 1 noarch
 #>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
 system i686 rpm system
 
 job install name A [forcebest]

diff --git a/test/testcases/forcebest/forcebest_up.t b/test/testcases/forcebest/forcebest_up.t
index 74c01b029a0e856258e4547d48b55e2ef35f75a4..6e97bf8f7001b13971798a682c6358be89e12924 100644 (file)
--- a/test/testcases/forcebest/forcebest_up.t
+++ b/test/testcases/forcebest/forcebest_up.t
@@ -1,28 +1,14 @@
 repo system 0 testtags <inline>
 #>=Pkg: A 1 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>A = 1-1
-#>-Prv:
 #>=Pkg: D 1 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>D = 1-1
-#>-Prv:
-#>+Con:
-#>A = 3-1
-#>-Con:
+#>=Con: A = 3-1
 repo available 0 testtags <inline>
 #>=Pkg: A 2 1 noarch
 #>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
 #>=Pkg: A 3 1 noarch
 #>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
 system i686 rpm system
 
 job update name A [forcebest]

diff --git a/test/testcases/targeted/targeted_dup.t b/test/testcases/targeted/targeted_dup.t
index 274f58a1ef0f72767a9451e14951c259b9f01fd4..d85f47795e5e40baabc983ac649bb281226972ed 100644 (file)
--- a/test/testcases/targeted/targeted_dup.t
+++ b/test/testcases/targeted/targeted_dup.t
@@ -1,46 +1,16 @@
 repo system 0 testtags <inline>
 #>=Pkg: A 1 1 noarch
-#>+Prv:
-#>A = 1-1 
-#>-Prv:
 #>=Pkg: D 1 1 noarch
-#>+Prv:
-#>D = 1-1 
-#>-Prv:
 #>=Pkg: Z 1 1 noarch
-#>+Prv:
-#>Z = 1-1 
-#>-Prv:
-#>+Con:
-#>D = 2-1 
-#>-Con:
+#>=Con: D = 2-1 
 repo available 0 testtags <inline>
 #>=Pkg: A 2 1 noarch
-#>+Prv:
-#>A = 2-1 
-#>-Prv:
 #>=Pkg: B 1 0 noarch
-#>+Prv:
-#>B = 1-0 
-#>-Prv:
-#>+Obs:
-#>A
-#>-Obs:
+#>=Obs: A
 #>=Pkg: C 1 0 noarch
-#>+Prv:
-#>C = 1-0 
-#>-Prv:
-#>+Obs:
-#>A = 1-1 
-#>-Obs:
+#>=Obs: A = 1-1 
 #>=Pkg: D 2 1 noarch
-#>+Prv:
-#>D = 2-1 
-#>-Prv:
 #>=Pkg: D 3 1 noarch
-#>+Prv:
-#>D = 3-1 
-#>-Prv:
 system i686 rpm system
 
 # first check untargeted

diff --git a/test/testcases/targeted/targeted_up.t b/test/testcases/targeted/targeted_up.t
index 8cfba41d0ccaf588121b5de59de8fb44cdbc850c..2b21c6b49af158e637f2e3407abfb3dcb1b5a2f3 100644 (file)
--- a/test/testcases/targeted/targeted_up.t
+++ b/test/testcases/targeted/targeted_up.t
@@ -1,46 +1,16 @@
 repo system 0 testtags <inline>
 #>=Pkg: A 1 1 noarch
-#>+Prv:
-#>A = 1-1
-#>-Prv:
 #>=Pkg: D 1 1 noarch
-#>+Prv:
-#>D = 1-1
-#>-Prv:
 #>=Pkg: Z 1 1 noarch
-#>+Prv:
-#>Z = 1-1
-#>-Prv:
-#>+Con:
-#>D = 2-1
-#>-Con:
+#>=Con: D = 2-1
 repo available 0 testtags <inline>
 #>=Pkg: A 2 1 noarch
-#>+Prv:
-#>A = 2-1
-#>-Prv:
 #>=Pkg: B 1 0 noarch
-#>+Prv:
-#>B = 1-0
-#>-Prv:
-#>+Obs:
-#>A
-#>-Obs:
+#>=Obs: A
 #>=Pkg: C 1 0 noarch
-#>+Prv:
-#>C = 1-0
-#>-Prv:
-#>+Obs:
-#>A = 1-1
-#>-Obs:
+#>=Obs: A = 1-1
 #>=Pkg: D 2 1 noarch
-#>+Prv:
-#>D = 2-1
-#>-Prv:
 #>=Pkg: D 3 1 noarch
-#>+Prv:
-#>D = 3-1
-#>-Prv:
 system i686 rpm system
 
 # first check untargeted