From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F240139085 for ; Thu, 26 Jan 2017 22:37:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96CC7E0E6D; Thu, 26 Jan 2017 22:37:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66C3DE0E6D for ; Thu, 26 Jan 2017 22:37:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 860FF341653 for ; Thu, 26 Jan 2017 22:37:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 645F930E2 for ; Thu, 26 Jan 2017 22:37:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1485470201.3e432d788743c159d045e2790cffc85fd70129b0.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/clusterssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/clusterssh/files/clusterssh-4.01.01-testfix-1.patch X-VCS-Directories: net-misc/clusterssh/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3e432d788743c159d045e2790cffc85fd70129b0 X-VCS-Branch: master Date: Thu, 26 Jan 2017 22:37:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b4069438-9908-40b2-9053-d5327ab3f9ef X-Archives-Hash: de05614428c14af073fadf467c59fd3b commit: 3e432d788743c159d045e2790cffc85fd70129b0 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Jan 25 19:44:27 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 26 22:36:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e432d78 net-misc/clusterssh: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3648 .../files/clusterssh-4.01.01-testfix-1.patch | 87 ---------------------- 1 file changed, 87 deletions(-) diff --git a/net-misc/clusterssh/files/clusterssh-4.01.01-testfix-1.patch b/net-misc/clusterssh/files/clusterssh-4.01.01-testfix-1.patch deleted file mode 100644 index 666a1c6..00000000 --- a/net-misc/clusterssh/files/clusterssh-4.01.01-testfix-1.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/t/15config.t b/t/15config.t -index 81d8f70..522997b 100644 ---- a/t/15config.t -+++ b/t/15config.t -@@ -8,6 +8,7 @@ use Test::More; - use Test::Trap; - use File::Which qw(which); - use File::Temp qw(tempdir); -+use Test::Differences; - - use Readonly; - -@@ -72,8 +73,8 @@ Readonly::Hash my %default_config => { - history_height => 10, - - command => q{}, -- title => q{15CONFIG.T}, -- comms => q{ssh}, -+ title => q{15CONFIG.T}, -+ comms => q{ssh}, - max_host_menu_items => 30, - - max_addhost_menu_cluster_items => 6, -@@ -241,11 +242,11 @@ is( $trap->stdout, q{}, 'Expecting no STDOUT' ); - is( $trap->stderr, q{}, 'Expecting no STDERR' ); - is_deeply( $config, \%expected, 'amended config is correct' ); - is( $path, which('ls'), 'Found correct path to "ls"' ); --is( $path, $newpath, 'No change made from find_binary'); -+is( $path, $newpath, 'No change made from find_binary' ); - - # give false path to force another search - trap { -- $newpath = $config->find_binary('/does/not/exist/'.$path); -+ $newpath = $config->find_binary( '/does/not/exist/' . $path ); - }; - is( $trap->leaveby, 'return', 'returned ok' ); - isa_ok( $config, "App::ClusterSSH::Config" ); -@@ -254,7 +255,7 @@ is( $trap->stdout, q{}, 'Expecting no STDOUT' ); - is( $trap->stderr, q{}, 'Expecting no STDERR' ); - is_deeply( $config, \%expected, 'amended config is correct' ); - is( $path, which('ls'), 'Found correct path to "ls"' ); --is( $path, $newpath, 'No change made from find_binary'); -+is( $path, $newpath, 'No change made from find_binary' ); - - note('Checks on loading configs'); - note('empty dir'); -@@ -456,12 +457,12 @@ is( $trap->stderr, - ); - - note('Checking dump'); --$config = App::ClusterSSH::Config->new(); -+$config = App::ClusterSSH::Config->new( -+ send_menu_xml_file => $ENV{HOME} . '/.csshrc_send_menu' ); - trap { - $config->dump(); - }; --my $expected = <<'EOF'; --# Configuration dump produced by "cssh -u" -+my $expected = qq{# Configuration dump produced by "cssh -u" - auto_close=5 - auto_quit=yes - console_position= -@@ -486,7 +487,7 @@ screen_reserve_bottom=60 - screen_reserve_left=0 - screen_reserve_right=0 - screen_reserve_top=0 --send_menu_xml_file=/home/dferguson/.csshrc_send_menu -+send_menu_xml_file=} . $ENV{HOME} . qq{/.csshrc_send_menu - show_history=0 - ssh_args= - telnet_args= -@@ -509,10 +510,11 @@ use_all_a_records=0 - use_hotkeys=yes - window_tiling=yes - window_tiling_direction=right --EOF -+}; -+ - isa_ok( $config, "App::ClusterSSH::Config" ); --is( $trap->die, undef, 'die message correct' ); --is( $trap->stdout, $expected, 'Expecting no STDOUT' ); --is( $trap->stderr, q{}, 'Expecting no STDERR' ); -+is( $trap->die, undef, 'die message correct' ); -+eq_or_diff( $trap->stdout, $expected, 'Expecting no STDOUT' ); -+is( $trap->stderr, q{}, 'Expecting no STDERR' ); - - done_testing();