git-credential-netrc: adapt to test framework for git

git-credential-netrc tests did not run in a test repository.
Reuse the main test framework to stage a temporary repository.
To imitate Perl tests under t/
- switch to Test::More module
- use File::Basename & File::Spec::Functions

Signed-off-by: Luis Marsano <luis.marsano@gmail.com>
Acked-by: Ted Zlatanov <tzz@lifelogs.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/credential/netrc/Makefile b/contrib/credential/netrc/Makefile
index 51b76138a5b14e05f530cd9ec0bb0b2fedff7493..0ffa40719126fe285722cfa8fc7b461d0584cd3a 100644 (file)
--- a/contrib/credential/netrc/Makefile
+++ b/contrib/credential/netrc/Makefile
@@ -1,5 +1,5 @@
 test:
 test:

-       ./test.pl
+       ./t-git-credential-netrc.sh

 
 testverbose:
 
 testverbose:

-       ./test.pl -d -v
+       ./t-git-credential-netrc.sh -d -v

diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh b/contrib/credential/netrc/t-git-credential-netrc.sh
new file mode 100755 (executable)
index 0000000..efb81ef
--- /dev/null
+++ b/contrib/credential/netrc/t-git-credential-netrc.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+(
+       cd ../../../t
+       test_description='git-credential-netrc'
+       . ./test-lib.sh
+
+       if ! test_have_prereq PERL; then
+               skip_all='skipping perl interface tests, perl not available'
+               test_done
+       fi
+
+       perl -MTest::More -e 0 2>/dev/null || {
+               skip_all="Perl Test::More unavailable, skipping test"
+               test_done
+       }
+
+       # set up test repository
+
+       test_expect_success \
+    'set up test repository' \
+    :
+
+       # The external test will outputs its own plan
+       test_external_has_tap=1
+
+       test_external \
+    'git-credential-netrc' \
+    perl "$TEST_DIRECTORY"/../contrib/credential/netrc/test.pl
+
+       test_done
+)

diff --git a/contrib/credential/netrc/test.pl b/contrib/credential/netrc/test.pl
index 169b6463c3011fbef721d926396fa20b5d1616f7..ea95a2c8ad77d1438c23abb1d1b38e6f9f29b6da 100755 (executable)
--- a/contrib/credential/netrc/test.pl
+++ b/contrib/credential/netrc/test.pl
@@ -1,83 +1,99 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

+use lib (split(/:/, $ENV{GITPERLLIB}));

 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use Test;
+use Test::More qw(no_plan);
+use File::Basename;
+use File::Spec::Functions qw(:DEFAULT rel2abs);

 use IPC::Open2;
 
 use IPC::Open2;
 

-BEGIN { plan tests => 15 }
+BEGIN {
+       # t-git-credential-netrc.sh kicks off our testing, so we have to go from there.
+       Test::More->builder->current_test(1);
+       Test::More->builder->no_ending(1);
+}

 
 my @global_credential_args = @ARGV;
 
 my @global_credential_args = @ARGV;

-my $netrc = './test.netrc';
-print "# Testing insecure file, nothing should be found\n";
+my $scriptDir = dirname rel2abs $0;
+my $netrc = catfile $scriptDir, 'test.netrc';
+my $gcNetrc = catfile $scriptDir, 'git-credential-netrc';
+local $ENV{PATH} = join ':'
+                      , $scriptDir
+                      , $ENV{PATH}
+                      ? $ENV{PATH}
+                      : ();
+
+diag "Testing insecure file, nothing should be found\n";

 chmod 0644, $netrc;
 my $cred = run_credential(['-f', $netrc, 'get'],
                          { host => 'github.com' });
 
 chmod 0644, $netrc;
 my $cred = run_credential(['-f', $netrc, 'get'],
                          { host => 'github.com' });
 

-ok(scalar keys %$cred, 0, "Got 0 keys from insecure file");
+ok(scalar keys %$cred == 0, "Got 0 keys from insecure file");

 
 

-print "# Testing missing file, nothing should be found\n";
+diag "Testing missing file, nothing should be found\n";

 chmod 0644, $netrc;
 $cred = run_credential(['-f', '///nosuchfile///', 'get'],
                       { host => 'github.com' });
 
 chmod 0644, $netrc;
 $cred = run_credential(['-f', '///nosuchfile///', 'get'],
                       { host => 'github.com' });
 

-ok(scalar keys %$cred, 0, "Got 0 keys from missing file");
+ok(scalar keys %$cred == 0, "Got 0 keys from missing file");

 
 chmod 0600, $netrc;
 
 
 chmod 0600, $netrc;
 

-print "# Testing with invalid data\n";
+diag "Testing with invalid data\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       "bad data");
 $cred = run_credential(['-f', $netrc, 'get'],
                       "bad data");

-ok(scalar keys %$cred, 4, "Got first found keys with bad data");
+ok(scalar keys %$cred == 4, "Got first found keys with bad data");

 
 

-print "# Testing netrc file for a missing corovamilkbar entry\n";
+diag "Testing netrc file for a missing corovamilkbar entry\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'corovamilkbar' });
 
 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'corovamilkbar' });
 

-ok(scalar keys %$cred, 0, "Got no corovamilkbar keys");
+ok(scalar keys %$cred == 0, "Got no corovamilkbar keys");

 
 

-print "# Testing netrc file for a github.com entry\n";
+diag "Testing netrc file for a github.com entry\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'github.com' });
 
 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'github.com' });
 

-ok(scalar keys %$cred, 2, "Got 2 Github keys");
+ok(scalar keys %$cred == 2, "Got 2 Github keys");

 
 

-ok($cred->{password}, 'carolknows', "Got correct Github password");
-ok($cred->{username}, 'carol', "Got correct Github username");
+is($cred->{password}, 'carolknows', "Got correct Github password");
+is($cred->{username}, 'carol', "Got correct Github username");

 
 

-print "# Testing netrc file for a username-specific entry\n";
+diag "Testing netrc file for a username-specific entry\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap', username => 'bob' });
 
 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap', username => 'bob' });
 

-ok(scalar keys %$cred, 2, "Got 2 username-specific keys");
+ok(scalar keys %$cred == 2, "Got 2 username-specific keys");

 
 

-ok($cred->{password}, 'bobwillknow', "Got correct user-specific password");
-ok($cred->{protocol}, 'imaps', "Got correct user-specific protocol");
+is($cred->{password}, 'bobwillknow', "Got correct user-specific password");
+is($cred->{protocol}, 'imaps', "Got correct user-specific protocol");

 
 

-print "# Testing netrc file for a host:port-specific entry\n";
+diag "Testing netrc file for a host:port-specific entry\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap2:1099' });
 
 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap2:1099' });
 

-ok(scalar keys %$cred, 2, "Got 2 host:port-specific keys");
+ok(scalar keys %$cred == 2, "Got 2 host:port-specific keys");

 
 

-ok($cred->{password}, 'tzzknow', "Got correct host:port-specific password");
-ok($cred->{username}, 'tzz', "Got correct host:port-specific username");
+is($cred->{password}, 'tzzknow', "Got correct host:port-specific password");
+is($cred->{username}, 'tzz', "Got correct host:port-specific username");

 
 

-print "# Testing netrc file that 'host:port kills host' entry\n";
+diag "Testing netrc file that 'host:port kills host' entry\n";

 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap2' });
 
 $cred = run_credential(['-f', $netrc, 'get'],
                       { host => 'imap2' });
 

-ok(scalar keys %$cred, 2, "Got 2 'host:port kills host' keys");
+ok(scalar keys %$cred == 2, "Got 2 'host:port kills host' keys");
+
+is($cred->{password}, 'bobwillknow', "Got correct 'host:port kills host' password");
+is($cred->{username}, 'bob', "Got correct 'host:port kills host' username");

 
 

-ok($cred->{password}, 'bobwillknow', "Got correct 'host:port kills host' password");
-ok($cred->{username}, 'bob', "Got correct 'host:port kills host' username");

 
 sub run_credential
 {
        my $args = shift @_;
        my $data = shift @_;
        my $pid = open2(my $chld_out, my $chld_in,
 
 sub run_credential
 {
        my $args = shift @_;
        my $data = shift @_;
        my $pid = open2(my $chld_out, my $chld_in,

-                       './git-credential-netrc', @global_credential_args,
+                       $gcNetrc, @global_credential_args,

                        @$args);
 
        die "Couldn't open pipe to netrc credential helper: $!" unless $pid;
                        @$args);
 
        die "Couldn't open pipe to netrc credential helper: $!" unless $pid;