From 32c5cd9ec00754569d8b4284b12ae81727a258e8 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 7 Sep 2007 15:03:25 +0000 Subject: add a reverse conflict test case, not nicely handled at the moment --- t/data/SPECS/split-transactions--promote-1/g.spec | 13 +++++++++++++ t/data/SPECS/split-transactions--promote-1/h.spec | 14 ++++++++++++++ t/data/SPECS/split-transactions--promote-2/g.spec | 13 +++++++++++++ t/data/SPECS/split-transactions--promote-2/h.spec | 13 +++++++++++++ t/superuser--split-transactions--promote.t | 15 +++++++++++++++ 5 files changed, 68 insertions(+) create mode 100644 t/data/SPECS/split-transactions--promote-1/g.spec create mode 100644 t/data/SPECS/split-transactions--promote-1/h.spec create mode 100644 t/data/SPECS/split-transactions--promote-2/g.spec create mode 100644 t/data/SPECS/split-transactions--promote-2/h.spec diff --git a/t/data/SPECS/split-transactions--promote-1/g.spec b/t/data/SPECS/split-transactions--promote-1/g.spec new file mode 100644 index 00000000..e82f1bf0 --- /dev/null +++ b/t/data/SPECS/split-transactions--promote-1/g.spec @@ -0,0 +1,13 @@ +Summary: x +Name: g +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--promote-1/h.spec b/t/data/SPECS/split-transactions--promote-1/h.spec new file mode 100644 index 00000000..7e98e6c9 --- /dev/null +++ b/t/data/SPECS/split-transactions--promote-1/h.spec @@ -0,0 +1,14 @@ +Summary: x +Name: h +Version: 1 +Release: 1 +License: x +Group: x +Url: x +Conflicts: g > 1 +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--promote-2/g.spec b/t/data/SPECS/split-transactions--promote-2/g.spec new file mode 100644 index 00000000..02d5dbfe --- /dev/null +++ b/t/data/SPECS/split-transactions--promote-2/g.spec @@ -0,0 +1,13 @@ +Summary: x +Name: g +Version: 2 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--promote-2/h.spec b/t/data/SPECS/split-transactions--promote-2/h.spec new file mode 100644 index 00000000..2bbcc00d --- /dev/null +++ b/t/data/SPECS/split-transactions--promote-2/h.spec @@ -0,0 +1,13 @@ +Summary: x +Name: h +Version: 2 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/superuser--split-transactions--promote.t b/t/superuser--split-transactions--promote.t index bbee7f5b..f3bb1d9d 100644 --- a/t/superuser--split-transactions--promote.t +++ b/t/superuser--split-transactions--promote.t @@ -9,6 +9,8 @@ # # e-2 conflicts with f-1 # +# g-2 conflicts with h-1 +# use strict; use lib '.', 't'; use helper; @@ -37,6 +39,9 @@ sub test { #- below need the promotion of "f-2" (upgraded from "f-1") to work test_ef("$split e"); + + #- WARNING: below would need the promotion of "h-2" (upgraded from "e-1") + test_gh("$split g"); } sub test_ab { @@ -68,3 +73,13 @@ sub test_ef { urpmi("--media $name-2 --auto $para"); check_installed_fullnames_and_remove('e-2-1', 'f-2-1'); } + +sub test_gh { + my ($para) = @_; + + urpmi("--media $name-1 --auto g h"); + check_installed_names('g', 'h'); + + urpmi("--media $name-2 --auto $para"); + check_installed_fullnames_and_remove('g-2-1'); # WARNING +} -- cgit v1.2.1