convert some testcase to "any disttype"

diff --git a/test/testcases/cleandeps/mistake.t b/test/testcases/cleandeps/mistake.t
index b51ff693dd1a791043931842be614714e6c4465b..48099a84977401c22a1c8427c2b61db043ae66d1 100644 (file)
--- a/test/testcases/cleandeps/mistake.t
+++ b/test/testcases/cleandeps/mistake.t
@@ -4,11 +4,11 @@ repo system 0 testtags <inline>
 #>=Pkg: B 2 1 noarch
 repo test 0 testtags <inline>
 #>=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 <inline>
-#>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 5d1ca1d835686e749b6ef1d15d233e50ce473121..b3a2482a09265e9f485006f1ce6f80d8227a0a3a 100644 (file)
--- a/test/testcases/sat/assert.t
+++ b/test/testcases/sat/assert.t
@@ -3,7 +3,7 @@ repo system 0 testtags <inline>
 #>=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 <inline>

diff --git a/test/testcases/sat/mm-packages.repo.gz b/test/testcases/sat/mm-packages.repo.gz
deleted file mode 100644 (file)
index fd4aa08..0000000
Binary files a/test/testcases/sat/mm-packages.repo.gz and /dev/null differ

diff --git a/test/testcases/sat/mm-system.repo.gz b/test/testcases/sat/mm-system.repo.gz
deleted file mode 100644 (file)
index ef1ac5f..0000000
Binary files a/test/testcases/sat/mm-system.repo.gz and /dev/null differ

diff --git a/test/testcases/sat/mm-test.t b/test/testcases/sat/mm-test.t
index 573dbb0fef0e03614f9ddbacc841d27026183dde..6665cad515f27e44bf92342d1fdffb0fd14ff5f5 100644 (file)
--- 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 <inline>
+#>=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 <inline>
+#>=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 <inline>

diff --git a/test/testcases/targeted/targeted_dup.t b/test/testcases/targeted/targeted_dup.t
index d85f47795e5e40baabc983ac649bb281226972ed..bce3fefdc05227add6a0314a73b5ebe056ec11a6 100644 (file)
--- a/test/testcases/targeted/targeted_dup.t
+++ b/test/testcases/targeted/targeted_dup.t
@@ -11,7 +11,7 @@ repo available 0 testtags <inline>
 #>=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 2b21c6b49af158e637f2e3407abfb3dcb1b5a2f3..1ab09e4b90d65b05ae4d9ee241b13ffe9ecbfc24 100644 (file)
--- a/test/testcases/targeted/targeted_up.t
+++ b/test/testcases/targeted/targeted_up.t
@@ -11,7 +11,7 @@ repo available 0 testtags <inline>
 #>=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