From f770b625d68fb46bb6ad024ea9ee3735636c7a24 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 21 Dec 2015 12:58:39 +0100 Subject: [PATCH] Add more dup tests --- ...up_allowuninstall => dup_allowuninstall.t} | 0 ...{dup_multiversion1 => dup_multiversion1.t} | 0 ...{dup_multiversion2 => dup_multiversion2.t} | 7 +- ...{dup_multiversion3 => dup_multiversion3.t} | 0 .../{dup_noarchchange => dup_noarchchange.t} | 0 test/testcases/distupgrade/dup_orphan1.t | 78 +++++++++++++++ test/testcases/distupgrade/dup_orphan2.t | 98 +++++++++++++++++++ test/testcases/distupgrade/dup_orphan3.t | 95 ++++++++++++++++++ 8 files changed, 276 insertions(+), 2 deletions(-) rename test/testcases/distupgrade/{dup_allowuninstall => dup_allowuninstall.t} (100%) rename test/testcases/distupgrade/{dup_multiversion1 => dup_multiversion1.t} (100%) rename test/testcases/distupgrade/{dup_multiversion2 => dup_multiversion2.t} (94%) rename test/testcases/distupgrade/{dup_multiversion3 => dup_multiversion3.t} (100%) rename test/testcases/distupgrade/{dup_noarchchange => dup_noarchchange.t} (100%) create mode 100644 test/testcases/distupgrade/dup_orphan1.t create mode 100644 test/testcases/distupgrade/dup_orphan2.t create mode 100644 test/testcases/distupgrade/dup_orphan3.t diff --git a/test/testcases/distupgrade/dup_allowuninstall b/test/testcases/distupgrade/dup_allowuninstall.t similarity index 100% rename from test/testcases/distupgrade/dup_allowuninstall rename to test/testcases/distupgrade/dup_allowuninstall.t diff --git a/test/testcases/distupgrade/dup_multiversion1 b/test/testcases/distupgrade/dup_multiversion1.t similarity index 100% rename from test/testcases/distupgrade/dup_multiversion1 rename to test/testcases/distupgrade/dup_multiversion1.t diff --git a/test/testcases/distupgrade/dup_multiversion2 b/test/testcases/distupgrade/dup_multiversion2.t similarity index 94% rename from test/testcases/distupgrade/dup_multiversion2 rename to test/testcases/distupgrade/dup_multiversion2.t index 18909ebb..67088960 100644 --- a/test/testcases/distupgrade/dup_multiversion2 +++ b/test/testcases/distupgrade/dup_multiversion2.t @@ -89,8 +89,10 @@ job multiversion name a job distupgrade all packages # a-1-1 is treated as orphaned and stays behind result transaction,problems -#>erase b-1-1.i686@system +#>erase a-1-1.i686@system #>install a-2-1.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available + nextjob @@ -100,7 +102,8 @@ job multiversion name a job distupgrade repo available # a-1-1 is treated as orphaned and stays behind result transaction,problems -#>erase b-1-1.i686@system +#>erase a-1-1.i686@system #>install a-2-1.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available diff --git a/test/testcases/distupgrade/dup_multiversion3 b/test/testcases/distupgrade/dup_multiversion3.t similarity index 100% rename from test/testcases/distupgrade/dup_multiversion3 rename to test/testcases/distupgrade/dup_multiversion3.t diff --git a/test/testcases/distupgrade/dup_noarchchange b/test/testcases/distupgrade/dup_noarchchange.t similarity index 100% rename from test/testcases/distupgrade/dup_noarchchange rename to test/testcases/distupgrade/dup_noarchchange.t diff --git a/test/testcases/distupgrade/dup_orphan1.t b/test/testcases/distupgrade/dup_orphan1.t new file mode 100644 index 00000000..3c4976aa --- /dev/null +++ b/test/testcases/distupgrade/dup_orphan1.t @@ -0,0 +1,78 @@ +# test dup with orphaned packages +# +# part 1: simple update +# +# dup should leave orphaned a installed +# +repo system 0 testtags +#>=Pkg: a 1 1 i686 +#>=Pkg: b 1 1 i686 +repo available 0 testtags +#>=Pkg: b 2 1 i686 +system i686 * system + +job distupgrade all packages +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + +nextjob + +job distupgrade repo available +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +### same with keeporphans + +nextjob + +solverflags keeporphans +job distupgrade all packages +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + +nextjob + +solverflags keeporphans +job distupgrade repo available +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +### same with allowuninstall + +nextjob + +solverflags allowuninstall +job distupgrade all packages +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags allowuninstall +job distupgrade repo available +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +### same with allowuninstall and keeporphans + +nextjob + +solverflags allowuninstall keeporphans +job distupgrade all packages +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags allowuninstall keeporphans +job distupgrade repo available +result transaction,problems +#>upgrade b-1-1.i686@system b-2-1.i686@available + + + diff --git a/test/testcases/distupgrade/dup_orphan2.t b/test/testcases/distupgrade/dup_orphan2.t new file mode 100644 index 00000000..f4e746ef --- /dev/null +++ b/test/testcases/distupgrade/dup_orphan2.t @@ -0,0 +1,98 @@ +# test dup with orphaned packages +# +# part 2: update conflicts with the orphan +# +# dup should leave orphaned a installed +# for "distupgrade repo available", a is not involved +# in the dup and thus not considered orphan. +# + +repo system 0 testtags +#>=Pkg: a 1 1 i686 +#>=Pkg: b 1 1 i686 +repo available 0 testtags +#>=Pkg: b 2 1 i686 +#>=Con: a +system i686 * system + +job distupgrade all packages +result transaction,problems +#>erase a-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + +nextjob + +job distupgrade repo available +result transaction,problems +#>erase a-1-1.i686@system +#>problem 4d4de423 info package b-2-1.i686 conflicts with a provided by a-1-1.i686 +#>problem 4d4de423 solution 2cf4745c erase a-1-1.i686@system +#>problem 4d4de423 solution 5a433aff allow b-1-1.i686@system +#>problem 4d4de423 solution ce4305f2 erase b-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + +### keeporphans + +nextjob + +solverflags keeporphans +job distupgrade all packages +result transaction,problems +#>problem 4d4de423 info package b-2-1.i686 conflicts with a provided by a-1-1.i686 +#>problem 4d4de423 solution 2cf4745c erase a-1-1.i686@system +#>problem 4d4de423 solution 5a433aff allow b-1-1.i686@system +#>problem 4d4de423 solution ce4305f2 erase b-1-1.i686@system + +nextjob + +solverflags keeporphans +job distupgrade repo available +result transaction,problems +#>erase a-1-1.i686@system +#>problem 4d4de423 info package b-2-1.i686 conflicts with a provided by a-1-1.i686 +#>problem 4d4de423 solution 2cf4745c erase a-1-1.i686@system +#>problem 4d4de423 solution 5a433aff allow b-1-1.i686@system +#>problem 4d4de423 solution ce4305f2 erase b-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +### same with allowuninstall + +nextjob + +solverflags allowuninstall +job distupgrade all packages +result transaction,problems +#>erase a-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags allowuninstall +job distupgrade repo available +result transaction,problems +#>erase b-1-1.i686@system + + +### same with allowuninstall and keeporphans + +nextjob + +solverflags allowuninstall keeporphans +job distupgrade all packages +result transaction,problems +#>erase a-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags allowuninstall keeporphans +job distupgrade repo available +result transaction,problems +#>erase a-1-1.i686@system +#>upgrade b-1-1.i686@system b-2-1.i686@available + + + diff --git a/test/testcases/distupgrade/dup_orphan3.t b/test/testcases/distupgrade/dup_orphan3.t new file mode 100644 index 00000000..6c043488 --- /dev/null +++ b/test/testcases/distupgrade/dup_orphan3.t @@ -0,0 +1,95 @@ +# test dup with orphaned packages +# +# part 3: a is not really an orphan, but cannott be downgraded +# + +repo system 0 testtags +#>=Pkg: a 1 1 i686 +#>=Pkg: b 1 1 i686 +repo available 0 testtags +#>=Pkg: a 1 0 i686 +#>=Pkg: b 2 1 i686 +system i686 * system + +solverflags !dupallowdowngrade +job distupgrade all packages +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available +#>problem c43b1300 info problem with installed package a-1-1.i686 +#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available + +nextjob + +solverflags !dupallowdowngrade +job distupgrade repo available +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available +#>problem c43b1300 info problem with installed package a-1-1.i686 +#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available + +### keeporphans + +nextjob + +solverflags !dupallowdowngrade keeporphans +job distupgrade all packages +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available +#>problem c43b1300 info problem with installed package a-1-1.i686 +#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available + +nextjob + +solverflags !dupallowdowngrade keeporphans +job distupgrade repo available +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available +#>problem c43b1300 info problem with installed package a-1-1.i686 +#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available + + +### same with allowuninstall + +nextjob + +solverflags !dupallowdowngrade allowuninstall +job distupgrade all packages +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags !dupallowdowngrade allowuninstall +job distupgrade repo available +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +### same with allowuninstall and keeporphans + +nextjob + +solverflags !dupallowdowngrade allowuninstall keeporphans +job distupgrade all packages +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available + + +nextjob + +solverflags !dupallowdowngrade allowuninstall keeporphans +job distupgrade repo available +result transaction,problems +#>downgrade a-1-1.i686@system a-1-0.i686@available +#>upgrade b-1-1.i686@system b-2-1.i686@available + + + -- 2.47.3