re-sync after the big svn loss

1 files changed, 21 insertions, 0 deletions

diff --git a/t/superuser--handle-conflict-deps.t b/t/superuser--handle-conflict-deps.t
new file mode 100644
index 00000000..a8a2e4c7
--- /dev/null
+++ b/t/superuser--handle-conflict-deps.t
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+# test from bugs #12696, #11885
+
+use strict;
+use lib '.', 't';
+use helper;
+use Expect;
+use urpm::util;
+use Test::More 'no_plan';
+
+need_root_and_prepare();
+
+my $name = 'handle-conflict-deps';
+urpmi_addmedia("$name $::pwd/media/$name");    
+
+urpmi('--auto a-sup');
+check_installed_names('a', 'a-sup');
+
+urpmi('--auto b');
+check_installed_names('b', 'b-sub');