From: Michael Schroeder Date: Wed, 5 Dec 2012 10:26:16 +0000 (+0100) Subject: simplify some testcases X-Git-Tag: BASE-SuSE-Code-12_3-Branch~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510dd15e9bc4fbe6a733c3c305929c81f9999e87;p=thirdparty%2Flibsolv.git simplify some testcases --- diff --git a/test/testcases/forcebest/forcebest_dup.t b/test/testcases/forcebest/forcebest_dup.t index 8de43eb0..7f1fbba4 100644 --- a/test/testcases/forcebest/forcebest_dup.t +++ b/test/testcases/forcebest/forcebest_dup.t @@ -1,28 +1,14 @@ repo system 0 testtags #>=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 #>=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 976ceda1..aaf2aa1d 100644 --- a/test/testcases/forcebest/forcebest_in.t +++ b/test/testcases/forcebest/forcebest_in.t @@ -1,23 +1,12 @@ repo system 0 testtags #>=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 #>=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 74c01b02..6e97bf8f 100644 --- a/test/testcases/forcebest/forcebest_up.t +++ b/test/testcases/forcebest/forcebest_up.t @@ -1,28 +1,14 @@ repo system 0 testtags #>=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 #>=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 274f58a1..d85f4779 100644 --- a/test/testcases/targeted/targeted_dup.t +++ b/test/testcases/targeted/targeted_dup.t @@ -1,46 +1,16 @@ repo system 0 testtags #>=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 #>=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 8cfba41d..2b21c6b4 100644 --- a/test/testcases/targeted/targeted_up.t +++ b/test/testcases/targeted/targeted_up.t @@ -1,46 +1,16 @@ repo system 0 testtags #>=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 #>=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