From 766afe724ed3d68252b2c384a6453e0dc08fd25b Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 26 May 2015 16:00:37 +0200 Subject: [PATCH] convert some testcase to "any disttype" --- test/testcases/cleandeps/mistake.t | 10 +++--- test/testcases/sat/assert.t | 2 +- test/testcases/sat/mm-packages.repo.gz | Bin 120 -> 0 bytes test/testcases/sat/mm-system.repo.gz | Bin 143 -> 0 bytes test/testcases/sat/mm-test.t | 43 +++++++++++++++++++++++-- test/testcases/targeted/targeted_dup.t | 2 +- test/testcases/targeted/targeted_up.t | 2 +- 7 files changed, 48 insertions(+), 11 deletions(-) delete mode 100644 test/testcases/sat/mm-packages.repo.gz delete mode 100644 test/testcases/sat/mm-system.repo.gz diff --git a/test/testcases/cleandeps/mistake.t b/test/testcases/cleandeps/mistake.t index b51ff693..48099a84 100644 --- a/test/testcases/cleandeps/mistake.t +++ b/test/testcases/cleandeps/mistake.t @@ -4,11 +4,11 @@ repo system 0 testtags #>=Pkg: B 2 1 noarch repo test 0 testtags #>=Pkg: A 2 1 noarch -#>=Req: B = 1 +#>=Req: B = 1-1 #>=Pkg: B 1 1 noarch -system i686 rpm system -job install name A = 2 [cleandeps] +system unset deb system +job install name A = 2-1 [cleandeps] result transaction,problems -#>problem b5abcb9c info package A-2-1.noarch requires B = 1, but none of the providers can be installed -#>problem b5abcb9c solution 37b448af deljob install name A = 2 [cleandeps] +#>problem b5abcb9c info package A-2-1.noarch requires B = 1-1, but none of the providers can be installed +#>problem b5abcb9c solution 3b3a37c0 deljob install name A = 2-1 [cleandeps] #>problem b5abcb9c solution 3c170283 replace B-2-1.noarch@system B-1-1.noarch@test diff --git a/test/testcases/sat/assert.t b/test/testcases/sat/assert.t index 5d1ca1d8..b3a2482a 100644 --- a/test/testcases/sat/assert.t +++ b/test/testcases/sat/assert.t @@ -3,7 +3,7 @@ repo system 0 testtags #>=Prv: AA #>=Pkg: B 1 1 x86_64 #>=Prv: AA -system x86_64 rpm system +system x86_64 * system job erase provides AA [weak] job install pkg B-1-1.x86_64@system result transaction,problems diff --git a/test/testcases/sat/mm-packages.repo.gz b/test/testcases/sat/mm-packages.repo.gz deleted file mode 100644 index fd4aa082593d2dfd7d0103abf4b953475e8b197b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 120 zc-oWi=3oE==FPm`x|@OwE*U@A#CyVTdr$$}Mo}KoPoIRlCmHY9!rXOg&5k*uIgW>R zwZ-g8uya|dY__y7V(PAh;8#tdD>n;_+Wbw-#J+(q6aa YPmNxz0r#ToqQ2S;mpWybd>I)S03T~GlK=n! diff --git a/test/testcases/sat/mm-system.repo.gz b/test/testcases/sat/mm-system.repo.gz deleted file mode 100644 index ef1ac5f57875bb1bc55d0d4fbaab49d284dd929c..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 143 zc-jGv0C4{wiwFP!0000018t5m3d1lE1p9r(^+LwF@<4^rJ;1ndAA*xWz#=O0{$M#^ zB(7Q(c9x0jR)lyM5$E?)XreHT6ll-4a(}@s+ee`AHQijkf{EfW@&Uefm+~%1@HNky x)ZNtKBWENN)&^D!)(-sZvgymMFx$r5D)(2Hv(0PEtI2E6{s8o!8wzm&000S!MNI$z diff --git a/test/testcases/sat/mm-test.t b/test/testcases/sat/mm-test.t index 573dbb0f..6665cad5 100644 --- a/test/testcases/sat/mm-test.t +++ b/test/testcases/sat/mm-test.t @@ -1,9 +1,46 @@ # # testcase to check enabling/disabling of learnt rules # -repo system 0 testtags mm-system.repo.gz -repo test 0 testtags mm-packages.repo.gz -system i686 rpm system +repo system 0 testtags +#>=Ver: 2.0 +#>=Pkg: A 1.0 1 noarch +#>=Req: D +#>=Prv: A = 1.0-1 +#>=Con: C +#>=Pkg: C 1.0 1 noarch +#>=Prv: foo +#>=Prv: C = 1.0-1 +#>=Con: D +#>=Pkg: D 1.0 1 noarch +#>=Prv: D = 1.0-1 +#>=Pkg: A2 1.0 1 noarch +#>=Req: D2 +#>=Prv: A2 = 1.0-1 +#>=Con: C2 +#>=Pkg: C2 1.0 1 noarch +#>=Prv: foo +#>=Prv: C2 = 1.0-1 +#>=Con: D2 +#>=Pkg: D2 1.0 1 noarch +#>=Prv: D2 = 1.0-1 +repo test 0 testtags +#>=Ver: 2.0 +#>=Pkg: C 2.0 1 noarch +#>=Prv: C = 2.0-1 +#>=Pkg: A 2.0 1 noarch +#>=Prv: A = 2.0-1 +#>=Pkg: D 2.0 1 noarch +#>=Prv: D = 2.0-1 +#>=Pkg: C2 2.0 1 noarch +#>=Prv: C2 = 2.0-1 +#>=Pkg: A2 2.0 1 noarch +#>=Prv: A2 = 2.0-1 +#>=Pkg: D2 2.0 1 noarch +#>=Prv: D2 = 2.0-1 +#>=Pkg: E 2.0 1 noarch +#>=Req: foo +#>=Prv: E = 2.0-1 +system unset * system job install provides E job verify all packages result transaction,problems diff --git a/test/testcases/targeted/targeted_dup.t b/test/testcases/targeted/targeted_dup.t index d85f4779..bce3fefd 100644 --- a/test/testcases/targeted/targeted_dup.t +++ b/test/testcases/targeted/targeted_dup.t @@ -11,7 +11,7 @@ repo available 0 testtags #>=Obs: A = 1-1 #>=Pkg: D 2 1 noarch #>=Pkg: D 3 1 noarch -system i686 rpm system +system unset * system # first check untargeted job distupgrade name A = 1-1 diff --git a/test/testcases/targeted/targeted_up.t b/test/testcases/targeted/targeted_up.t index 2b21c6b4..1ab09e4b 100644 --- a/test/testcases/targeted/targeted_up.t +++ b/test/testcases/targeted/targeted_up.t @@ -11,7 +11,7 @@ repo available 0 testtags #>=Obs: A = 1-1 #>=Pkg: D 2 1 noarch #>=Pkg: D 3 1 noarch -system i686 rpm system +system unset * system # first check untargeted job update name A = 1-1 -- 2.47.3