[PATCH] t9143: do not fail when unhandled.log.gz is not created

[PATCH] t9143: do not fail when unhandled.log.gz is not created

[Torsten Bögershausen]

Commit df73af5f66 is does not let the test case fail,
when Compress::Zlib is missing.
But:
On a MacOS X 10.6 system with missing Compress::Zlib
using svn version 1.6.5 (r38866) the gz file is created.
Solution:
Check for the existance of the unhandled.log.gz file.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
  t/t9143-git-svn-gc.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
index 337ea59..8a95d78 100755
--- a/t/t9143-git-svn-gc.sh
+++ b/t/t9143-git-svn-gc.sh
@@ -37,7 +37,7 @@ test_expect_success 'git svn gc runs' 'git svn gc'
   test_expect_success 'git svn index removed' '! test -f 
.git/svn/refs/remotes/git-svn/index'
  -if perl -MCompress::Zlib -e 0 2>/dev/null
+if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
  then
  	test_expect_success 'git svn gc produces a valid gzip file' '
  		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
-- 
1.6.6

Re: [PATCH] t9143: do not fail when unhandled.log.gz is not created

[Eric Wong]

Torsten Bögershausen <tboegi@web.de> wrote:
> Commit df73af5f66 is does not let the test case fail,
> when Compress::Zlib is missing.
> But:
> On a MacOS X 10.6 system with missing Compress::Zlib
> using svn version 1.6.5 (r38866) the gz file is created.
> Solution:
> Check for the existance of the unhandled.log.gz file.

I wonder if your system could have multiple perl installations and
git-svn is calling one while the shell scripts are calling another.
I'm not sure if there is another way the gz file could be created while
Compress::Zlib is missing.

> Signed-off-by: Torsten Bögershausen <tboegi@web.de>

Torsten Bögershausen wrote in <4CFA27DD.7030105@web.de>:
> Now we do not depend on internal implementation details of svn.
> And the code is 3% easier to understand :-)

I agree on this point completely

Acked-by: Eric Wong <normalperson@yhbt.net>

> ---
>  t/t9143-git-svn-gc.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
> index 337ea59..8a95d78 100755
> --- a/t/t9143-git-svn-gc.sh
> +++ b/t/t9143-git-svn-gc.sh
> @@ -37,7 +37,7 @@ test_expect_success 'git svn gc runs' 'git svn gc'
>   test_expect_success 'git svn index removed' '! test -f  
> .git/svn/refs/remotes/git-svn/index'
>  -if perl -MCompress::Zlib -e 0 2>/dev/null
> +if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
>  then
>  	test_expect_success 'git svn gc produces a valid gzip file' '
>  		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
> -- 

Re: [PATCH] t9143: do not fail when unhandled.log.gz is not created

[Torsten Bögershausen]

On 12/06/2010 08:23 PM, Eric Wong wrote:
> Torsten Bögershausen<tboegi@web.de>  wrote:
>> Commit df73af5f66 is does not let the test case fail,
>> when Compress::Zlib is missing.
>> But:
>> On a MacOS X 10.6 system with missing Compress::Zlib
>> using svn version 1.6.5 (r38866) the gz file is created.
>> Solution:
>> Check for the existance of the unhandled.log.gz file.
>
> I wonder if your system could have multiple perl installations and
> git-svn is calling one while the shell scripts are calling another.
> I'm not sure if there is another way the gz file could be created while
> Compress::Zlib is missing.
>
>> Signed-off-by: Torsten Bögershausen<tboegi@web.de>
>
> Torsten Bögershausen wrote in<4CFA27DD.7030105@web.de>:
>> Now we do not depend on internal implementation details of svn.
>> And the code is 3% easier to understand :-)
>
> I agree on this point completely
>
> Acked-by: Eric Wong<normalperson@yhbt.net>
>
>> ---
>>   t/t9143-git-svn-gc.sh |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
>> index 337ea59..8a95d78 100755
>> --- a/t/t9143-git-svn-gc.sh
>> +++ b/t/t9143-git-svn-gc.sh
>> @@ -37,7 +37,7 @@ test_expect_success 'git svn gc runs' 'git svn gc'
>>    test_expect_success 'git svn index removed' '! test -f
>> .git/svn/refs/remotes/git-svn/index'
>>   -if perl -MCompress::Zlib -e 0 2>/dev/null
>> +if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
>>   then
>>   	test_expect_success 'git svn gc produces a valid gzip file' '
>>   		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
>> --
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric,
thanks for the input.
I have indeed 2 perl versions:
find / -xdev -name perl -type f 2>/dev/null | xargs ls -l
-rwxr-xr-x  2 root  admin  1297824 Jan  7  2010 /opt/local/bin/perl
-rwxr-xr-x  2 root  admin  1297824 Jan  7  2010 
/opt/local/var/macports/software/perl5.8/5.8.9_3/opt/local/bin/perl
-rwxr-xr-x  1 root  wheel    86000 Jun 26  2009 /usr/bin/perl
-r--r--r--  1 root  wheel     1813 May 18  2009 /usr/share/file/magic/perl

  which perl
/opt/local/bin/perl

/opt/local/bin/perl -MCompress::Zlib -e 0 ; echo $?
Can't locate Compress/Zlib.pm in @INC (@INC contains: /sw/lib/perl5 
/sw/lib/perl5/darwin /opt/local/lib/perl5/site_perl/5.8.9/darwin-2level 
/opt/local/lib/perl5/site_perl/5.8.9 /opt/local/lib/perl5/site_perl 
/opt/local/lib/perl5/vendor_perl/5.8.9/darwin-2level 
/opt/local/lib/perl5/vendor_perl/5.8.9 /opt/local/lib/perl5/vendor_perl 
/opt/local/lib/perl5/5.8.9/darwin-2level /opt/local/lib/perl5/5.8.9 .).
BEGIN failed--compilation aborted.
2


  /usr/bin/perl -MCompress::Zlib -e 0 ; echo $?
0
==================
If you agree, I will send a V2 version of the patch, which
will use the following:
---------------------------
if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
then
	test_expect_success 'git svn gc produces a valid gzip file' '
		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
		'
fi
----------------
This will simply check if the unhandled.log.gz exist,
and if, it will be unpacked.
I removed the else and
   say "# Perl Compress::Zlib unavailable, skipping gunzip test"

/Torsten

Re: [PATCH] t9143: do not fail when unhandled.log.gz is not created

[Eric Wong]

Torsten Bögershausen <totte.enea@gmail.com> wrote:
> If you agree, I will send a V2 version of the patch, which
> will use the following:
> ---------------------------
> if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
> then
> 	test_expect_success 'git svn gc produces a valid gzip file' '
> 		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
> 		'
> fi

Yes, it's definitely a better test.  Thanks!

-- 
Eric Wong

[PATCH] t9143: do not fail when unhandled.log.gz is not created

[Torsten Bögershausen]

Do not depend on internal implementation details of svn,
which right now uses perl to create a .gz file.
So this test case will even work in the future,
when svn changes its implementation.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
  t/t9143-git-svn-gc.sh |    4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
index 337ea59..4594e1a 100755
--- a/t/t9143-git-svn-gc.sh
+++ b/t/t9143-git-svn-gc.sh
@@ -37,13 +37,11 @@ test_expect_success 'git svn gc runs' 'git svn gc'
   test_expect_success 'git svn index removed' '! test -f 
.git/svn/refs/remotes/git-svn/index'
  -if perl -MCompress::Zlib -e 0 2>/dev/null
+if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
  then
  	test_expect_success 'git svn gc produces a valid gzip file' '
  		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
  		'
-else
-	say "# Perl Compress::Zlib unavailable, skipping gunzip test"
  fi
   test_expect_success 'git svn gc does not change unhandled.log files' '
-- 
1.6.6

Re: [PATCH] t9143: do not fail when unhandled.log.gz is not created

[Eric Wong]

Torsten Bögershausen <tboegi@web.de> wrote:
> Do not depend on internal implementation details of svn,
> which right now uses perl to create a .gz file.
> So this test case will even work in the future,
> when svn changes its implementation.
>
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>

Thanks Torsten, I needed to fix whitespace mangling from
your mailer to get it to apply cleanly.

Acked-by: Eric Wong <normalperson@yhbt.net>

It's pushed out to git://git.bogomips.org/git-svn along with an
older patch from Steven:

Steven Walter (1):
      git-svn: allow the mergeinfo property to be set

Torsten Bögershausen (1):
      t9143: do not fail when unhandled.log.gz is not created

-- 
Eric Wong

Re: [PATCH] t9143: do not fail when unhandled.log.gz is not created

[Junio C Hamano]

Eric Wong <normalperson@yhbt.net> writes:

> It's pushed out to git://git.bogomips.org/git-svn along with an
> older patch from Steven:
>
> Steven Walter (1):
>       git-svn: allow the mergeinfo property to be set
>
> Torsten Bögershausen (1):
>       t9143: do not fail when unhandled.log.gz is not created

Thanks; will pull.

[PATCH] t9143: do not fail when unhandled.log.gz is not created

[Torsten Bögershausen]

t9143 fails on my system because a unhandled.log.gz is created,
even if perls Compress::Zlib is missing.
Instead of relying on svn using perl and its Zlib to generate
a .gz file, simply check if the .gz file had been created.
Now we do not depend on internal implementation details of svn.
And the code is 3% easier to understand :-)

*** BLURB HERE ***

Torsten Bögershausen (1):
   t9143: do not fail when unhandled.log.gz is not created

  t/t9143-git-svn-gc.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)