[PATCH 1/2] t0109: refactor test code into a function

[PATCH 1/2] t0109: refactor test code into a function

[john]

This will allow us to run this test for multiple URLs.

While doing this, also specify CGIT_CONFIG and QUERY_STRING when
invoking cgit under strace.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 tests/t0109-gitconfig.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh
index f64e691..31d18b5 100755
--- a/tests/t0109-gitconfig.sh
+++ b/tests/t0109-gitconfig.sh
@@ -9,17 +9,22 @@ test -n "$(which strace 2>/dev/null)" || {
 	exit
 }
 
-test_expect_success 'no access to $HOME' '
+test_no_home_access () {
 	non_existant_path="/path/to/some/place/that/does/not/possibly/exist"
 	while test -d "$non_existant_path"; do
 		non_existant_path="$non_existant_path/$(date +%N)"
-	done
+	done &&
+	CGIT_CONFIG="$(pwd)/cgitrc" QUERY_STRING="url=$1" \
 	strace \
 		-E HOME="$non_existant_path" \
 		-E CGIT_CONFIG="$PWD/cgitrc" \
 		-E QUERY_STRING="url=foo/commit" \
 		-e access -f -o strace.out cgit &&
 	test_must_fail grep "$non_existant_path" strace.out
+}
+
+test_expect_success 'no access to $HOME' '
+	test_no_home_access ""
 '
 
 test_done
-- 
1.8.2.694.ga76e9c3.dirty

[PATCH 2/2] t0109: test using multiple URLs

[john]

This ensures that we don't end up reading a configuration later for some
specific view.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 tests/t0109-gitconfig.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh
index 31d18b5..154a595 100755
--- a/tests/t0109-gitconfig.sh
+++ b/tests/t0109-gitconfig.sh
@@ -27,4 +27,36 @@ test_expect_success 'no access to $HOME' '
 	test_no_home_access ""
 '
 
+test_expect_success 'foo' '
+	test_no_home_access foo
+'
+
+test_expect_success 'foo/refs' '
+	test_no_home_access foo/refs
+'
+
+test_expect_success 'foo/log' '
+	test_no_home_access foo/log
+'
+
+test_expect_success 'foo/tree' '
+	test_no_home_access foo/tree
+'
+
+test_expect_success 'foo/tree/file-1' '
+	test_no_home_access foo/tree/file-1
+'
+
+test_expect_success 'foo/commit' '
+	test_no_home_access foo/commit
+'
+
+test_expect_success 'foo/diff' '
+	test_no_home_access foo/diff
+'
+
+test_expect_success 'foo/patch' '
+	test_no_home_access foo/patch
+'
+
 test_done
-- 
1.8.2.694.ga76e9c3.dirty

[PATCH 1/2] t0109: refactor test code into a function

[Jason]

On Sun, Apr 14, 2013 at 6:07 PM, John Keeping <john at keeping.me.uk> wrote:
> -test_expect_success 'no access to $HOME' '
> +test_no_home_access () {
>         non_existant_path="/path/to/some/place/that/does/not/possibly/exist"
>         while test -d "$non_existant_path"; do
>                 non_existant_path="$non_existant_path/$(date +%N)"
> -       done
> +       done &&
> +       CGIT_CONFIG="$(pwd)/cgitrc" QUERY_STRING="url=$1" \

Superfluous, as strace sets environment variables.


>         strace \
>                 -E HOME="$non_existant_path" \
>                 -E CGIT_CONFIG="$PWD/cgitrc" \
>                 -E QUERY_STRING="url=foo/commit" \

In fact, it still picks up this old one.

>                 -e access -f -o strace.out cgit &&
>         test_must_fail grep "$non_existant_path" strace.out
> +}
> +
> +test_expect_success 'no access to $HOME' '
> +       test_no_home_access ""
>  '
>

I refactored this commit and 2/2 here:

http://git.zx2c4.com/cgit/commit/?h=wip&id=a814ede7838c5d2be8d0e926e2dfe4a4c66d7dcc

[PATCH 1/2] t0109: refactor test code into a function

[john]

On Mon, Apr 15, 2013 at 04:48:45PM +0200, Jason A. Donenfeld wrote:
> On Sun, Apr 14, 2013 at 6:07 PM, John Keeping <john at keeping.me.uk> wrote:
> > -test_expect_success 'no access to $HOME' '
> > +test_no_home_access () {
> >         non_existant_path="/path/to/some/place/that/does/not/possibly/exist"
> >         while test -d "$non_existant_path"; do
> >                 non_existant_path="$non_existant_path/$(date +%N)"
> > -       done
> > +       done &&
> > +       CGIT_CONFIG="$(pwd)/cgitrc" QUERY_STRING="url=$1" \
> 
> Superfluous, as strace sets environment variables.
> 
> 
> >         strace \
> >                 -E HOME="$non_existant_path" \
> >                 -E CGIT_CONFIG="$PWD/cgitrc" \
> >                 -E QUERY_STRING="url=foo/commit" \
> 
> In fact, it still picks up this old one.

Ah, so it does :-(

> >                 -e access -f -o strace.out cgit &&
> >         test_must_fail grep "$non_existant_path" strace.out
> > +}
> > +
> > +test_expect_success 'no access to $HOME' '
> > +       test_no_home_access ""
> >  '
> >
> 
> I refactored this commit and 2/2 here:
> 
> http://git.zx2c4.com/cgit/commit/?h=wip&id=a814ede7838c5d2be8d0e926e2dfe4a4c66d7dcc

Thanks.  The code looks good, but the commit message seems a little
confused now.  How about:

    t0109: test more URLs

    In order to ensure that we don't access $HOME at some point after
    initial startup when rendering a specific view, run the strace test
    on a range of different pages.

?

[PATCH 1/2] t0109: refactor test code into a function

[Jason]

On Mon, Apr 15, 2013 at 4:56 PM, John Keeping <john at keeping.me.uk> wrote:
>     t0109: test more URLs

Ack.