From 8adcdd428ca36ec03120bd015d422bbe6118b209 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 22 Jun 2007 08:01:38 +0000
Subject: obsolete-and-provide test into provide-and-no-obsolete (much better
 name since there really is no obsolete used)

---
 t/data/SPECS/obsolete-and-provide/a-1.spec    | 14 -----------
 t/data/SPECS/obsolete-and-provide/a-2.spec    | 14 -----------
 t/data/SPECS/obsolete-and-provide/b-3.spec    | 14 -----------
 t/data/SPECS/provide-and-no-obsolete/a-1.spec | 14 +++++++++++
 t/data/SPECS/provide-and-no-obsolete/a-2.spec | 14 +++++++++++
 t/data/SPECS/provide-and-no-obsolete/b-3.spec | 14 +++++++++++
 t/superuser--obsolete-and-provide.t           | 27 ---------------------
 t/superuser--provide-and-no-obsolete.t        | 35 +++++++++++++++++++++++++++
 8 files changed, 77 insertions(+), 69 deletions(-)
 delete mode 100644 t/data/SPECS/obsolete-and-provide/a-1.spec
 delete mode 100644 t/data/SPECS/obsolete-and-provide/a-2.spec
 delete mode 100644 t/data/SPECS/obsolete-and-provide/b-3.spec
 create mode 100644 t/data/SPECS/provide-and-no-obsolete/a-1.spec
 create mode 100644 t/data/SPECS/provide-and-no-obsolete/a-2.spec
 create mode 100644 t/data/SPECS/provide-and-no-obsolete/b-3.spec
 delete mode 100644 t/superuser--obsolete-and-provide.t
 create mode 100644 t/superuser--provide-and-no-obsolete.t

(limited to 't')

diff --git a/t/data/SPECS/obsolete-and-provide/a-1.spec b/t/data/SPECS/obsolete-and-provide/a-1.spec
deleted file mode 100644
index acddee43..00000000
--- a/t/data/SPECS/obsolete-and-provide/a-1.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-Summary: a
-Name: a
-Version: 1
-Release: 1
-License: x
-Group: x
-Url: x
-Provides: c = %{version}
-BuildRoot: %{_tmppath}/%{name}
-
-%description
-x
-
-%files
diff --git a/t/data/SPECS/obsolete-and-provide/a-2.spec b/t/data/SPECS/obsolete-and-provide/a-2.spec
deleted file mode 100644
index 68193e92..00000000
--- a/t/data/SPECS/obsolete-and-provide/a-2.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-Summary: a
-Name: a
-Version: 2
-Release: 1
-License: x
-Group: x
-Url: x
-Provides: c = %{version}
-BuildRoot: %{_tmppath}/%{name}
-
-%description
-x
-
-%files
diff --git a/t/data/SPECS/obsolete-and-provide/b-3.spec b/t/data/SPECS/obsolete-and-provide/b-3.spec
deleted file mode 100644
index 1936a709..00000000
--- a/t/data/SPECS/obsolete-and-provide/b-3.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-Summary: b
-Name: b
-Version: 3
-Release: 1
-License: x
-Group: x
-Url: x
-Provides: c = %{version}
-BuildRoot: %{_tmppath}/%{name}
-
-%description
-x
-
-%files
diff --git a/t/data/SPECS/provide-and-no-obsolete/a-1.spec b/t/data/SPECS/provide-and-no-obsolete/a-1.spec
new file mode 100644
index 00000000..acddee43
--- /dev/null
+++ b/t/data/SPECS/provide-and-no-obsolete/a-1.spec
@@ -0,0 +1,14 @@
+Summary: a
+Name: a
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+Provides: c = %{version}
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/provide-and-no-obsolete/a-2.spec b/t/data/SPECS/provide-and-no-obsolete/a-2.spec
new file mode 100644
index 00000000..68193e92
--- /dev/null
+++ b/t/data/SPECS/provide-and-no-obsolete/a-2.spec
@@ -0,0 +1,14 @@
+Summary: a
+Name: a
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Provides: c = %{version}
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/provide-and-no-obsolete/b-3.spec b/t/data/SPECS/provide-and-no-obsolete/b-3.spec
new file mode 100644
index 00000000..1936a709
--- /dev/null
+++ b/t/data/SPECS/provide-and-no-obsolete/b-3.spec
@@ -0,0 +1,14 @@
+Summary: b
+Name: b
+Version: 3
+Release: 1
+License: x
+Group: x
+Url: x
+Provides: c = %{version}
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/superuser--obsolete-and-provide.t b/t/superuser--obsolete-and-provide.t
deleted file mode 100644
index dc45e45e..00000000
--- a/t/superuser--obsolete-and-provide.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use lib '.', 't';
-use helper;
-use Test::More 'no_plan';
-
-my $medium_name = 'obsolete-and-provide';
-
-need_root_and_prepare();
-
-urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
-
-test(sub { urpmi('a'); check_installed_fullnames("a-2-1"); urpme('a') });
-test(sub { urpmi('b'); check_installed_fullnames("a-1-1", "b-3-1"); urpme('a b') });
-
-#- the following test fail. "urpmi --auto-select" should do the same as "urpmi a"
-#test(sub { urpmi('--auto-select'); check_installed_fullnames("a-2-1"); urpme('a') });
-
-sub test {
-    my ($f) = @_;
-    system_("rpm --root $::pwd/root -i media/$medium_name/a-1-*.rpm");
-    is(`rpm -qa --root $::pwd/root`, "a-1-1\n");
-
-    $f->();
-    check_nothing_installed();
-}
diff --git a/t/superuser--provide-and-no-obsolete.t b/t/superuser--provide-and-no-obsolete.t
new file mode 100644
index 00000000..564bab5c
--- /dev/null
+++ b/t/superuser--provide-and-no-obsolete.t
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+# a somewhat weird in urpmi that can somehow be workarounded
+#
+#   package "a-1" provides "c-1"
+#   package "a-2" provides "c-2"
+#   package "b-3" provides "c-3"
+# urpmi should still be able to upgrade "a-1" into "a-2" even in presence of "b-3"
+# (which do not obsolete "a" so can't be installed)
+
+use strict;
+use lib '.', 't';
+use helper;
+use Test::More 'no_plan';
+
+my $medium_name = 'obsolete-and-provide';
+
+need_root_and_prepare();
+
+urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
+
+test(sub { urpmi('a'); check_installed_fullnames("a-2-1"); urpme('a') });
+test(sub { urpmi('b'); check_installed_fullnames("a-1-1", "b-3-1"); urpme('a b') });
+
+#- the following test fail. "urpmi --auto-select" should do the same as "urpmi a"
+#test(sub { urpmi('--auto-select'); check_installed_fullnames("a-2-1"); urpme('a') });
+
+sub test {
+    my ($f) = @_;
+    system_("rpm --root $::pwd/root -i media/$medium_name/a-1-*.rpm");
+    is(`rpm -qa --root $::pwd/root`, "a-1-1\n");
+
+    $f->();
+    check_nothing_installed();
+}
-- 
cgit v1.2.1