Skip to content

Commit

Permalink
t5704: match tests to modern style
Browse files Browse the repository at this point in the history
The test did not adhere to the current style on several counts:

 . empty lines around the test blocks, but within the test string
 . ': > file' or even just '> file' with an extra space
 . inconsistent indentation
 . hand-rolled commits instead of using test_commit

Fix all of them.

There's a catch to the last point: test_commit creates a tag, which the
original test did not create.  We still change it to test_commit, and
explicitly delete the tags, so as to highlight that the test relies on not
having them.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Thomas Rast authored and Junio C Hamano committed Feb 23, 2012
1 parent 1c5f93b commit 8a557bb
Showing 1 changed file with 8 additions and 25 deletions.
33 changes: 8 additions & 25 deletions t/t5704-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,42 @@ test_description='some bundle related tests'
. ./test-lib.sh

test_expect_success 'setup' '
: > file &&
git add file &&
test_tick &&
git commit -m initial &&
test_commit initial &&
test_tick &&
git tag -m tag tag &&
: > file2 &&
git add file2 &&
: > file3 &&
test_tick &&
git commit -m second &&
git add file3 &&
test_tick &&
git commit -m third
test_commit second &&
test_commit third &&
git tag -d initial &&
git tag -d second &&
git tag -d third
'

test_expect_success 'tags can be excluded by rev-list options' '
git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
git ls-remote bundle > output &&
! grep tag output
'

test_expect_success 'die if bundle file cannot be created' '
mkdir adir &&
test_must_fail git bundle create adir --all
'

test_expect_failure 'bundle --stdin' '
echo master | git bundle create stdin-bundle.bdl --stdin &&
git ls-remote stdin-bundle.bdl >output &&
grep master output
'

test_expect_failure 'bundle --stdin <rev-list options>' '
echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
git ls-remote hybrid-bundle.bdl >output &&
grep master output
'

test_expect_success 'empty bundle file is rejected' '
>empty-bundle && test_must_fail git fetch empty-bundle
: >empty-bundle &&
test_must_fail git fetch empty-bundle
'

# This triggers a bug in older versions where the resulting line (with
Expand Down

0 comments on commit 8a557bb

Please sign in to comment.