From 057a1d282470737596128bc132be9d075f077d50 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mandriva.org>
Date: Wed, 8 Jul 2009 14:47:22 +0000
Subject: Add testcase for bug #52135 (disabled). Adding g.spec changes hdlist
 ordering and changes result of another test in handle-conflict-deps; change
 the test accordingly and clarify the WARNING text for that test to explain
 why it happens.

---
 MANIFEST                                 |  1 +
 t/data/SPECS/handle-conflict-deps/g.spec | 14 ++++++++++++++
 t/superuser--handle-conflict-deps.t      |  6 +++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 t/data/SPECS/handle-conflict-deps/g.spec

diff --git a/MANIFEST b/MANIFEST
index ebebd8d6..8fb81be0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -174,6 +174,7 @@ t/data/SPECS/handle-conflict-deps/c.spec
 t/data/SPECS/handle-conflict-deps/d.spec
 t/data/SPECS/handle-conflict-deps/e.spec
 t/data/SPECS/handle-conflict-deps/f.spec
+t/data/SPECS/handle-conflict-deps/g.spec
 t/data/SPECS/handle-conflict-deps2/a1-1.spec
 t/data/SPECS/handle-conflict-deps2/a1-2.spec
 t/data/SPECS/handle-conflict-deps2/a2.spec
diff --git a/t/data/SPECS/handle-conflict-deps/g.spec b/t/data/SPECS/handle-conflict-deps/g.spec
new file mode 100644
index 00000000..79a62551
--- /dev/null
+++ b/t/data/SPECS/handle-conflict-deps/g.spec
@@ -0,0 +1,14 @@
+Summary: x
+Name: g
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildRoot: %{_tmppath}/%{name}
+Conflicts: ff
+
+%description
+x
+
+%files
diff --git a/t/superuser--handle-conflict-deps.t b/t/superuser--handle-conflict-deps.t
index abb6f233..dd0f9c59 100644
--- a/t/superuser--handle-conflict-deps.t
+++ b/t/superuser--handle-conflict-deps.t
@@ -8,6 +8,7 @@
 #
 # e conflicts with ff
 # f provides ff
+# g conflicts with ff
 #
 use strict;
 use lib '.', 't';
@@ -38,7 +39,10 @@ sub test_conflict_on_upgrade {
 
 sub test_conflict_on_install {
     urpmi('--auto a b');
-    check_installed_and_remove('b', 'b-sub'); # WARNING: why does it choose one or the other?
+    check_installed_and_remove('a'); # WARNING: either a or b is chosen, depending on hdlist order
+
+#    urpmi('--auto f g'); # test for bug #52135
+#    check_installed_and_remove('g');
 }
 
 sub test_simple {
-- 
cgit v1.2.1