projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d3f223
)
simplify some testcases
author
Michael Schroeder
<mls@suse.de>
Wed, 5 Dec 2012 10:26:16 +0000
(11:26 +0100)
committer
Michael Schroeder
<mls@suse.de>
Wed, 5 Dec 2012 10:26:16 +0000
(11:26 +0100)
test/testcases/forcebest/forcebest_dup.t
patch
|
blob
|
history
test/testcases/forcebest/forcebest_in.t
patch
|
blob
|
history
test/testcases/forcebest/forcebest_up.t
patch
|
blob
|
history
test/testcases/targeted/targeted_dup.t
patch
|
blob
|
history
test/testcases/targeted/targeted_up.t
patch
|
blob
|
history
diff --git
a/test/testcases/forcebest/forcebest_dup.t
b/test/testcases/forcebest/forcebest_dup.t
index
8de43eb
..
7f1fbba
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
repo system 0 testtags <inline>
#>=Pkg: A 1 1 noarch
#>=Vnd: foo
-#>+Prv:
-#>A = 1-1
-#>-Prv:
#>=Pkg: D 1 1 noarch
#>=Vnd: foo
#>=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
repo available 0 testtags <inline>
#>=Pkg: A 2 1 noarch
#>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
system i686 rpm system
job distupgrade name A [forcebest]
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
976ceda
..
aaf2aa1
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
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
repo available 0 testtags <inline>
#>=Pkg: A 2 1 noarch
#>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
system i686 rpm system
job install name A [forcebest]
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
74c01b0
..
6e97bf8
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
repo system 0 testtags <inline>
#>=Pkg: A 1 1 noarch
#>=Vnd: foo
-#>+Prv:
-#>A = 1-1
-#>-Prv:
#>=Pkg: D 1 1 noarch
#>=Vnd: foo
#>=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
repo available 0 testtags <inline>
#>=Pkg: A 2 1 noarch
#>=Vnd: foo
-#>+Prv:
-#>A = 2-1
-#>-Prv:
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
#>=Pkg: A 3 1 noarch
#>=Vnd: bar
-#>+Prv:
-#>A = 3-1
-#>-Prv:
system i686 rpm system
job update name A [forcebest]
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
274f58a
..
d85f477
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
repo system 0 testtags <inline>
#>=Pkg: A 1 1 noarch
-#>+Prv:
-#>A = 1-1
-#>-Prv:
#>=Pkg: D 1 1 noarch
#>=Pkg: D 1 1 noarch
-#>+Prv:
-#>D = 1-1
-#>-Prv:
#>=Pkg: Z 1 1 noarch
#>=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
repo available 0 testtags <inline>
#>=Pkg: A 2 1 noarch
-#>+Prv:
-#>A = 2-1
-#>-Prv:
#>=Pkg: B 1 0 noarch
#>=Pkg: B 1 0 noarch
-#>+Prv:
-#>B = 1-0
-#>-Prv:
-#>+Obs:
-#>A
-#>-Obs:
+#>=Obs: A
#>=Pkg: C 1 0 noarch
#>=Pkg: C 1 0 noarch
-#>+Prv:
-#>C = 1-0
-#>-Prv:
-#>+Obs:
-#>A = 1-1
-#>-Obs:
+#>=Obs: A = 1-1
#>=Pkg: D 2 1 noarch
#>=Pkg: D 2 1 noarch
-#>+Prv:
-#>D = 2-1
-#>-Prv:
#>=Pkg: D 3 1 noarch
#>=Pkg: D 3 1 noarch
-#>+Prv:
-#>D = 3-1
-#>-Prv:
system i686 rpm system
# first check untargeted
system i686 rpm system
# first check untargeted
diff --git
a/test/testcases/targeted/targeted_up.t
b/test/testcases/targeted/targeted_up.t
index
8cfba41
..
2b21c6b
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
repo system 0 testtags <inline>
#>=Pkg: A 1 1 noarch
-#>+Prv:
-#>A = 1-1
-#>-Prv:
#>=Pkg: D 1 1 noarch
#>=Pkg: D 1 1 noarch
-#>+Prv:
-#>D = 1-1
-#>-Prv:
#>=Pkg: Z 1 1 noarch
#>=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
repo available 0 testtags <inline>
#>=Pkg: A 2 1 noarch
-#>+Prv:
-#>A = 2-1
-#>-Prv:
#>=Pkg: B 1 0 noarch
#>=Pkg: B 1 0 noarch
-#>+Prv:
-#>B = 1-0
-#>-Prv:
-#>+Obs:
-#>A
-#>-Obs:
+#>=Obs: A
#>=Pkg: C 1 0 noarch
#>=Pkg: C 1 0 noarch
-#>+Prv:
-#>C = 1-0
-#>-Prv:
-#>+Obs:
-#>A = 1-1
-#>-Obs:
+#>=Obs: A = 1-1
#>=Pkg: D 2 1 noarch
#>=Pkg: D 2 1 noarch
-#>+Prv:
-#>D = 2-1
-#>-Prv:
#>=Pkg: D 3 1 noarch
#>=Pkg: D 3 1 noarch
-#>+Prv:
-#>D = 3-1
-#>-Prv:
system i686 rpm system
# first check untargeted
system i686 rpm system
# first check untargeted