From 58c9411b535302166226b8700c21fd740d44befb Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 5 Sep 2007 15:49:38 +0000 Subject: add a simple test that shows urpmi promotes pkgs when a strict require fails --- t/data/SPECS/split-transactions--strict-require-1/a.spec | 2 +- t/data/SPECS/split-transactions--strict-require-1/b.spec | 13 +++++++++++++ t/data/SPECS/split-transactions--strict-require-1/bb.spec | 15 --------------- .../SPECS/split-transactions--strict-require-1/c-1.spec | 13 ------------- t/data/SPECS/split-transactions--strict-require-2/a.spec | 4 ++-- t/data/SPECS/split-transactions--strict-require-2/b.spec | 2 -- .../SPECS/split-transactions--strict-require-2/c-2.spec | 13 ------------- .../a.spec | 14 ++++++++++++++ .../bb.spec | 15 +++++++++++++++ .../c-1.spec | 13 +++++++++++++ .../a.spec | 14 ++++++++++++++ .../b.spec | 15 +++++++++++++++ .../c-2.spec | 13 +++++++++++++ 13 files changed, 100 insertions(+), 46 deletions(-) create mode 100644 t/data/SPECS/split-transactions--strict-require-1/b.spec delete mode 100644 t/data/SPECS/split-transactions--strict-require-1/bb.spec delete mode 100644 t/data/SPECS/split-transactions--strict-require-1/c-1.spec delete mode 100644 t/data/SPECS/split-transactions--strict-require-2/c-2.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-1/a.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-1/bb.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-1/c-1.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-2/a.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-2/b.spec create mode 100644 t/data/SPECS/split-transactions--strict-require-and-obsolete-2/c-2.spec (limited to 't/data') diff --git a/t/data/SPECS/split-transactions--strict-require-1/a.spec b/t/data/SPECS/split-transactions--strict-require-1/a.spec index b0345d65..b9d1643b 100644 --- a/t/data/SPECS/split-transactions--strict-require-1/a.spec +++ b/t/data/SPECS/split-transactions--strict-require-1/a.spec @@ -5,7 +5,7 @@ Release: 1 License: x Group: x Url: x -Requires: b +Requires: b = 1 BuildRoot: %{_tmppath}/%{name} %description diff --git a/t/data/SPECS/split-transactions--strict-require-1/b.spec b/t/data/SPECS/split-transactions--strict-require-1/b.spec new file mode 100644 index 00000000..337a7807 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-1/b.spec @@ -0,0 +1,13 @@ +Summary: x +Name: b +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-1/bb.spec b/t/data/SPECS/split-transactions--strict-require-1/bb.spec deleted file mode 100644 index 4d3a9673..00000000 --- a/t/data/SPECS/split-transactions--strict-require-1/bb.spec +++ /dev/null @@ -1,15 +0,0 @@ -Summary: x -Name: bb -Version: 1 -Release: 1 -License: x -Group: x -Url: x -Provides: b -Requires: c = %{version} -BuildRoot: %{_tmppath}/%{name} - -%description -x - -%files diff --git a/t/data/SPECS/split-transactions--strict-require-1/c-1.spec b/t/data/SPECS/split-transactions--strict-require-1/c-1.spec deleted file mode 100644 index 21381cf9..00000000 --- a/t/data/SPECS/split-transactions--strict-require-1/c-1.spec +++ /dev/null @@ -1,13 +0,0 @@ -Summary: x -Name: c -Version: 1 -Release: 1 -License: x -Group: x -Url: x -BuildRoot: %{_tmppath}/%{name} - -%description -x - -%files diff --git a/t/data/SPECS/split-transactions--strict-require-2/a.spec b/t/data/SPECS/split-transactions--strict-require-2/a.spec index b0345d65..8c506dea 100644 --- a/t/data/SPECS/split-transactions--strict-require-2/a.spec +++ b/t/data/SPECS/split-transactions--strict-require-2/a.spec @@ -1,11 +1,11 @@ Summary: x Name: a -Version: 1 +Version: 2 Release: 1 License: x Group: x Url: x -Requires: b +Requires: b = 2 BuildRoot: %{_tmppath}/%{name} %description diff --git a/t/data/SPECS/split-transactions--strict-require-2/b.spec b/t/data/SPECS/split-transactions--strict-require-2/b.spec index 9986a114..61c0beca 100644 --- a/t/data/SPECS/split-transactions--strict-require-2/b.spec +++ b/t/data/SPECS/split-transactions--strict-require-2/b.spec @@ -5,8 +5,6 @@ Release: 1 License: x Group: x Url: x -Requires: c = %{version} -Obsoletes: bb BuildRoot: %{_tmppath}/%{name} %description diff --git a/t/data/SPECS/split-transactions--strict-require-2/c-2.spec b/t/data/SPECS/split-transactions--strict-require-2/c-2.spec deleted file mode 100644 index 3ede1e1e..00000000 --- a/t/data/SPECS/split-transactions--strict-require-2/c-2.spec +++ /dev/null @@ -1,13 +0,0 @@ -Summary: x -Name: c -Version: 2 -Release: 1 -License: x -Group: x -Url: x -BuildRoot: %{_tmppath}/%{name} - -%description -x - -%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/a.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/a.spec new file mode 100644 index 00000000..b0345d65 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/a.spec @@ -0,0 +1,14 @@ +Summary: x +Name: a +Version: 1 +Release: 1 +License: x +Group: x +Url: x +Requires: b +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/bb.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/bb.spec new file mode 100644 index 00000000..4d3a9673 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/bb.spec @@ -0,0 +1,15 @@ +Summary: x +Name: bb +Version: 1 +Release: 1 +License: x +Group: x +Url: x +Provides: b +Requires: c = %{version} +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/c-1.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/c-1.spec new file mode 100644 index 00000000..21381cf9 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-1/c-1.spec @@ -0,0 +1,13 @@ +Summary: x +Name: c +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/a.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/a.spec new file mode 100644 index 00000000..b0345d65 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/a.spec @@ -0,0 +1,14 @@ +Summary: x +Name: a +Version: 1 +Release: 1 +License: x +Group: x +Url: x +Requires: b +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/b.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/b.spec new file mode 100644 index 00000000..9986a114 --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/b.spec @@ -0,0 +1,15 @@ +Summary: x +Name: b +Version: 2 +Release: 1 +License: x +Group: x +Url: x +Requires: c = %{version} +Obsoletes: bb +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/c-2.spec b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/c-2.spec new file mode 100644 index 00000000..3ede1e1e --- /dev/null +++ b/t/data/SPECS/split-transactions--strict-require-and-obsolete-2/c-2.spec @@ -0,0 +1,13 @@ +Summary: x +Name: c +Version: 2 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files -- cgit v1.2.1