diff options
| author | John Keeping <john@keeping.me.uk> | 2013-03-04 21:58:50 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-03-04 19:39:07 -0500 |
| commit | f9b801a1746d6c4476b230659d2e1f3714986550 (patch) | |
| tree | 45db8777646083bb9bb8fd023169e6f88bd02caa | |
| parent | tests: "grep -e" is not portable to all platforms (diff) | |
| download | cgit-pink-f9b801a1746d6c4476b230659d2e1f3714986550.tar.gz cgit-pink-f9b801a1746d6c4476b230659d2e1f3714986550.zip | |
tests: make whitespace consistent
Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to '')
| -rwxr-xr-x | tests/t0105-commit.sh | 14 | ||||
| -rwxr-xr-x | tests/t0107-snapshot.sh | 15 | ||||
| -rwxr-xr-x | tests/t0108-patch.sh | 2 |
3 files changed, 17 insertions, 14 deletions
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index 19a650b..31b554b 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh @@ -16,22 +16,22 @@ run_test 'find commit msg' 'grep "<div class=.commit-msg.></div>" trash/tmp' run_test 'find diffstat' 'grep "<table summary=.diffstat. class=.diffstat.>" trash/tmp' run_test 'find diff summary' ' - grep "1 files changed, 1 insertions, 0 deletions" trash/tmp + grep "1 files changed, 1 insertions, 0 deletions" trash/tmp ' run_test 'get root commit' ' - root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && - cgit_url "foo/commit&id=$root" >trash/tmp && - grep "</html>" trash/tmp + root=$(cd trash/repos/foo && git rev-list --reverse HEAD | head -1) && + cgit_url "foo/commit&id=$root" >trash/tmp && + grep "</html>" trash/tmp ' run_test 'root commit contains diffstat' ' - grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp + grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" trash/tmp ' run_test 'root commit contains diff' ' - grep ">diff --git a/file-1 b/file-1<" trash/tmp && - grep "<div class=.add.>+1</div>" trash/tmp + grep ">diff --git a/file-1 b/file-1<" trash/tmp && + grep "<div class=.add.>+1</div>" trash/tmp ' tests_done diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index 8ad9573..d23bf97 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh @@ -10,17 +10,20 @@ run_test 'get foo/snapshot/master.tar.gz' ' run_test 'check html headers' ' head -n 1 trash/tmp | - grep "Content-Type: application/x-gzip" && + grep "Content-Type: application/x-gzip" && head -n 2 trash/tmp | - grep "Content-Disposition: inline; filename=.master.tar.gz." + grep "Content-Disposition: inline; filename=.master.tar.gz." ' run_test 'strip off the header lines' ' - tail -n +6 trash/tmp > trash/master.tar.gz + tail -n +6 trash/tmp > trash/master.tar.gz +' + +run_test ' + verify gzip format' 'gunzip --test trash/master.tar.gz ' -run_test 'verify gzip format' 'gunzip --test trash/master.tar.gz' run_test 'untar' ' rm -rf trash/master && tar -xf trash/master.tar.gz -C trash @@ -32,8 +35,8 @@ run_test 'count files' ' ' run_test 'verify untarred file-5' ' - grep "^5$" trash/master/file-5 && - test $(cat trash/master/file-5 | wc -l) = 1 + grep "^5$" trash/master/file-5 && + test $(cat trash/master/file-5 | wc -l) = 1 ' tests_done diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index f15c893..f92f69c 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh @@ -21,7 +21,7 @@ run_test 'find `Subject:` line' ' ' run_test 'find `cgit` signature' ' - tail -1 trash/tmp | grep "^cgit" + tail -1 trash/tmp | grep "^cgit" ' run_test 'find initial commit' ' |