Merge branch 'jc/test-lazy-prereq' (early part)
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:21:26 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:21:26 +0000 (13:21 -0700)
* 'jc/test-lazy-prereq' (early part):
t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: do not chdir around in the primary test process
t3302: coding style updates
test: turn USR_BIN_TIME into a lazy prerequisite
test: turn EXPENSIVE into a lazy prerequisite

1  2 
t/t5551-http-fetch-smart.sh
t/test-lib.sh
index 2c4913354756896d498cede8fbaa83f8106d22f7,0000000000000000000000000000000000000000..6cbc12d9a7ad059f77967c0bdb702d8a5ec75bb9
mode 100755,000000..100755
--- /dev/null
@@@ -1,251 -1,0 +1,249 @@@
- test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE
 +#!/bin/sh
 +
 +test_description='test smart fetching over http via http-backend'
 +. ./test-lib.sh
 +
 +if test -n "$NO_CURL"; then
 +      skip_all='skipping test, git built without http support'
 +      test_done
 +fi
 +
 +. "$TEST_DIRECTORY"/lib-httpd.sh
 +start_httpd
 +
 +test_expect_success 'setup repository' '
 +      git config push.default matching &&
 +      echo content >file &&
 +      git add file &&
 +      git commit -m one
 +'
 +
 +test_expect_success 'create http-accessible bare repository' '
 +      mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 +      (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 +       git --bare init
 +      ) &&
 +      git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 +      git push public master:master
 +'
 +
 +setup_askpass_helper
 +
 +cat >exp <<EOF
 +> GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1
 +> Accept: */*
 +> Accept-Encoding: gzip
 +> Pragma: no-cache
 +< HTTP/1.1 200 OK
 +< Pragma: no-cache
 +< Cache-Control: no-cache, max-age=0, must-revalidate
 +< Content-Type: application/x-git-upload-pack-advertisement
 +> POST /smart/repo.git/git-upload-pack HTTP/1.1
 +> Accept-Encoding: gzip
 +> Content-Type: application/x-git-upload-pack-request
 +> Accept: application/x-git-upload-pack-result
 +> Content-Length: xxx
 +< HTTP/1.1 200 OK
 +< Pragma: no-cache
 +< Cache-Control: no-cache, max-age=0, must-revalidate
 +< Content-Type: application/x-git-upload-pack-result
 +EOF
 +test_expect_success 'clone http repository' '
 +      GIT_CURL_VERBOSE=1 git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
 +      test_cmp file clone/file &&
 +      tr '\''\015'\'' Q <err |
 +      sed -e "
 +              s/Q\$//
 +              /^[*] /d
 +              /^$/d
 +              /^< $/d
 +
 +              /^[^><]/{
 +                      s/^/> /
 +              }
 +
 +              /^> User-Agent: /d
 +              /^> Host: /d
 +              /^> POST /,$ {
 +                      /^> Accept: [*]\\/[*]/d
 +              }
 +              s/^> Content-Length: .*/> Content-Length: xxx/
 +              /^> 00..want /d
 +              /^> 00.*done/d
 +
 +              /^< Server: /d
 +              /^< Expires: /d
 +              /^< Date: /d
 +              /^< Content-Length: /d
 +              /^< Transfer-Encoding: /d
 +      " >act &&
 +      test_cmp exp act
 +'
 +
 +test_expect_success 'fetch changes via http' '
 +      echo content >>file &&
 +      git commit -a -m two &&
 +      git push public
 +      (cd clone && git pull) &&
 +      test_cmp file clone/file
 +'
 +
 +cat >exp <<EOF
 +GET  /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
 +POST /smart/repo.git/git-upload-pack HTTP/1.1 200
 +GET  /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
 +POST /smart/repo.git/git-upload-pack HTTP/1.1 200
 +EOF
 +test_expect_success 'used upload-pack service' '
 +      sed -e "
 +              s/^.* \"//
 +              s/\"//
 +              s/ [1-9][0-9]*\$//
 +              s/^GET /GET  /
 +      " >act <"$HTTPD_ROOT_PATH"/access.log &&
 +      test_cmp exp act
 +'
 +
 +test_expect_success 'follow redirects (301)' '
 +      git clone $HTTPD_URL/smart-redir-perm/repo.git --quiet repo-p
 +'
 +
 +test_expect_success 'follow redirects (302)' '
 +      git clone $HTTPD_URL/smart-redir-temp/repo.git --quiet repo-t
 +'
 +
 +test_expect_success 'redirects re-root further requests' '
 +      git clone $HTTPD_URL/smart-redir-limited/repo.git repo-redir-limited
 +'
 +
 +test_expect_success 'clone from password-protected repository' '
 +      echo two >expect &&
 +      set_askpass user@host pass@host &&
 +      git clone --bare "$HTTPD_URL/auth/smart/repo.git" smart-auth &&
 +      expect_askpass both user@host &&
 +      git --git-dir=smart-auth log -1 --format=%s >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success 'clone from auth-only-for-push repository' '
 +      echo two >expect &&
 +      set_askpass wrong &&
 +      git clone --bare "$HTTPD_URL/auth-push/smart/repo.git" smart-noauth &&
 +      expect_askpass none &&
 +      git --git-dir=smart-noauth log -1 --format=%s >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success 'clone from auth-only-for-objects repository' '
 +      echo two >expect &&
 +      set_askpass user@host pass@host &&
 +      git clone --bare "$HTTPD_URL/auth-fetch/smart/repo.git" half-auth &&
 +      expect_askpass both user@host &&
 +      git --git-dir=half-auth log -1 --format=%s >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success 'no-op half-auth fetch does not require a password' '
 +      set_askpass wrong &&
 +      git --git-dir=half-auth fetch &&
 +      expect_askpass none
 +'
 +
 +test_expect_success 'redirects send auth to new location' '
 +      set_askpass user@host pass@host &&
 +      git -c credential.useHttpPath=true \
 +        clone $HTTPD_URL/smart-redir-auth/repo.git repo-redir-auth &&
 +      expect_askpass both user@host auth/smart/repo.git
 +'
 +
 +test_expect_success 'disable dumb http on server' '
 +      git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
 +              config http.getanyfile false
 +'
 +
 +test_expect_success 'GIT_SMART_HTTP can disable smart http' '
 +      (GIT_SMART_HTTP=0 &&
 +       export GIT_SMART_HTTP &&
 +       cd clone &&
 +       test_must_fail git fetch)
 +'
 +
 +test_expect_success 'invalid Content-Type rejected' '
 +      test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual
 +      grep "not valid:" actual
 +'
 +
 +test_expect_success 'create namespaced refs' '
 +      test_commit namespaced &&
 +      git push public HEAD:refs/namespaces/ns/refs/heads/master &&
 +      git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
 +              symbolic-ref refs/namespaces/ns/HEAD refs/namespaces/ns/refs/heads/master
 +'
 +
 +test_expect_success 'smart clone respects namespace' '
 +      git clone "$HTTPD_URL/smart_namespace/repo.git" ns-smart &&
 +      echo namespaced >expect &&
 +      git --git-dir=ns-smart/.git log -1 --format=%s >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success 'dumb clone via http-backend respects namespace' '
 +      git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
 +              config http.getanyfile true &&
 +      GIT_SMART_HTTP=0 git clone \
 +              "$HTTPD_URL/smart_namespace/repo.git" ns-dumb &&
 +      echo namespaced >expect &&
 +      git --git-dir=ns-dumb/.git log -1 --format=%s >actual &&
 +      test_cmp expect actual
 +'
 +
 +cat >cookies.txt <<EOF
 +127.0.0.1     FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 +EOF
 +cat >expect_cookies.txt <<EOF
 +
 +127.0.0.1     FALSE   /smart_cookies/ FALSE   0       othername       othervalue
 +127.0.0.1     FALSE   /smart_cookies/repo.git/info/   FALSE   0       name    value
 +EOF
 +test_expect_success 'cookies stored in http.cookiefile when http.savecookies set' '
 +      git config http.cookiefile cookies.txt &&
 +      git config http.savecookies true &&
 +      git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
 +      tail -3 cookies.txt > cookies_tail.txt
 +      test_cmp expect_cookies.txt cookies_tail.txt
 +'
 +
 +test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '
 +      (
 +      cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 +      for i in `test_seq 50000`
 +      do
 +              echo "commit refs/heads/too-many-refs"
 +              echo "mark :$i"
 +              echo "committer git <git@example.com> $i +0000"
 +              echo "data 0"
 +              echo "M 644 inline bla.txt"
 +              echo "data 4"
 +              echo "bla"
 +              # make every commit dangling by always
 +              # rewinding the branch after each commit
 +              echo "reset refs/heads/too-many-refs"
 +              echo "from :1"
 +      done | git fast-import --export-marks=marks &&
 +
 +      # now assign tags to all the dangling commits we created above
 +      tag=$(perl -e "print \"bla\" x 30") &&
 +      sed -e "s|^:\([^ ]*\) \(.*\)$|\2 refs/tags/$tag-\1|" <marks >>packed-refs
 +      )
 +'
 +
 +test_expect_success EXPENSIVE 'clone the 50,000 tag repo to check OS command line overflow' '
 +      git clone $HTTPD_URL/smart/repo.git too-many-refs &&
 +      (
 +              cd too-many-refs &&
 +              test $(git for-each-ref refs/tags | wc -l) = 50000
 +      )
 +'
 +
 +stop_httpd
 +test_done
diff --combined t/test-lib.sh
index 81394c8c7c859b1a46a765c05020e74bf0e2808e,884c57c30bfa60ac55cce020828b025b75a8a26c..a4795373a6a2e1f247b3cef9880f2a82309b3594
@@@ -1,4 -1,4 +1,4 @@@
 -#!/bin/sh
 +# Test framework for git.  See t/README for usage.
  #
  # Copyright (c) 2005 Junio C Hamano
  #
@@@ -26,10 -26,6 +26,10 @@@ the
        # outside of t/, e.g. for running tests on the test library
        # itself.
        TEST_DIRECTORY=$(pwd)
 +else
 +      # ensure that TEST_DIRECTORY is an absolute path so that it
 +      # is valid even if the current working directory is changed
 +      TEST_DIRECTORY=$(cd "$TEST_DIRECTORY" && pwd) || exit 1
  fi
  if test -z "$TEST_OUTPUT_DIRECTORY"
  then
@@@ -91,7 -87,6 +91,7 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
                VALGRIND
                UNZIP
                PERF_
 +              CURL_VERBOSE
        ));
        my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
        print join("\n", @vars);
@@@ -109,12 -104,6 +109,12 @@@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAM
  export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
  export EDITOR
  
 +if test -n "${TEST_GIT_INDEX_VERSION:+isset}"
 +then
 +      GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"
 +      export GIT_INDEX_VERSION
 +fi
 +
  # Add libc MALLOC and MALLOC_PERTURB test
  # only if we are not executing the test with valgrind
  if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||
                immediate=t; shift ;;
        -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
                GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;;
 +      -r)
 +              shift; test "$#" -ne 0 || {
 +                      echo 'error: -r requires an argument' >&2;
 +                      exit 1;
 +              }
 +              run_list=$1; shift ;;
 +      --run=*)
 +              run_list=$(expr "z$1" : 'z[^=]*=\(.*\)'); shift ;;
        -h|--h|--he|--hel|--help)
                help=t; shift ;;
        -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
@@@ -292,7 -273,7 +292,7 @@@ error "Test script did not set test_des
  
  if test "$help" = "t"
  then
 -      echo "$test_description"
 +      printf '%s\n' "$test_description"
        exit 0
  fi
  
@@@ -343,7 -324,7 +343,7 @@@ test_failure_ () 
        test_failure=$(($test_failure + 1))
        say_color error "not ok $test_count - $1"
        shift
 -      echo "$@" | sed -e 's/^/#       /'
 +      printf '%s\n' "$*" | sed -e 's/^/#      /'
        test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
  }
  
@@@ -375,99 -356,6 +375,99 @@@ match_pattern_list () 
        return 1
  }
  
 +match_test_selector_list () {
 +      title="$1"
 +      shift
 +      arg="$1"
 +      shift
 +      test -z "$1" && return 0
 +
 +      # Both commas and whitespace are accepted as separators.
 +      OLDIFS=$IFS
 +      IFS='   ,'
 +      set -- $1
 +      IFS=$OLDIFS
 +
 +      # If the first selector is negative we include by default.
 +      include=
 +      case "$1" in
 +              !*) include=t ;;
 +      esac
 +
 +      for selector
 +      do
 +              orig_selector=$selector
 +
 +              positive=t
 +              case "$selector" in
 +                      !*)
 +                              positive=
 +                              selector=${selector##?}
 +                              ;;
 +              esac
 +
 +              test -z "$selector" && continue
 +
 +              case "$selector" in
 +                      *-*)
 +                              if expr "z${selector%%-*}" : "z[0-9]*[^0-9]" >/dev/null
 +                              then
 +                                      echo "error: $title: invalid non-numeric in range" \
 +                                              "start: '$orig_selector'" >&2
 +                                      exit 1
 +                              fi
 +                              if expr "z${selector#*-}" : "z[0-9]*[^0-9]" >/dev/null
 +                              then
 +                                      echo "error: $title: invalid non-numeric in range" \
 +                                              "end: '$orig_selector'" >&2
 +                                      exit 1
 +                              fi
 +                              ;;
 +                      *)
 +                              if expr "z$selector" : "z[0-9]*[^0-9]" >/dev/null
 +                              then
 +                                      echo "error: $title: invalid non-numeric in test" \
 +                                              "selector: '$orig_selector'" >&2
 +                                      exit 1
 +                              fi
 +              esac
 +
 +              # Short cut for "obvious" cases
 +              test -z "$include" && test -z "$positive" && continue
 +              test -n "$include" && test -n "$positive" && continue
 +
 +              case "$selector" in
 +                      -*)
 +                              if test $arg -le ${selector#-}
 +                              then
 +                                      include=$positive
 +                              fi
 +                              ;;
 +                      *-)
 +                              if test $arg -ge ${selector%-}
 +                              then
 +                                      include=$positive
 +                              fi
 +                              ;;
 +                      *-*)
 +                              if test ${selector%%-*} -le $arg \
 +                                      && test $arg -le ${selector#*-}
 +                              then
 +                                      include=$positive
 +                              fi
 +                              ;;
 +                      *)
 +                              if test $arg -eq $selector
 +                              then
 +                                      include=$positive
 +                              fi
 +                              ;;
 +              esac
 +      done
 +
 +      test -n "$include"
 +}
 +
  maybe_teardown_verbose () {
        test -z "$verbose_only" && return
        exec 4>/dev/null 3>/dev/null
@@@ -554,35 -442,25 +554,35 @@@ test_finish_ () 
  
  test_skip () {
        to_skip=
 +      skipped_reason=
        if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
        then
                to_skip=t
 +              skipped_reason="GIT_SKIP_TESTS"
        fi
        if test -z "$to_skip" && test -n "$test_prereq" &&
           ! test_have_prereq "$test_prereq"
        then
                to_skip=t
 -      fi
 -      case "$to_skip" in
 -      t)
 +
                of_prereq=
                if test "$missing_prereq" != "$test_prereq"
                then
                        of_prereq=" of $test_prereq"
                fi
 +              skipped_reason="missing $missing_prereq${of_prereq}"
 +      fi
 +      if test -z "$to_skip" && test -n "$run_list" &&
 +              ! match_test_selector_list '--run' $test_count "$run_list"
 +      then
 +              to_skip=t
 +              skipped_reason="--run"
 +      fi
  
 +      case "$to_skip" in
 +      t)
                say_color skip >&3 "skipping test: $@"
 -              say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})"
 +              say_color skip "ok $test_count # skip $1 ($skipped_reason)"
                : true
                ;;
        *)
@@@ -599,6 -477,8 +599,6 @@@ test_at_end_hook_ () 
  test_done () {
        GIT_EXIT_OK=t
  
 -      # Note: t0000 relies on $HARNESS_ACTIVE disabling the .counts
 -      # output file
        if test -z "$HARNESS_ACTIVE"
        then
                test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"
@@@ -693,9 -573,11 +693,9 @@@ the
  
        make_valgrind_symlink () {
                # handle only executables, unless they are shell libraries that
 -              # need to be in the exec-path.  We will just use "#!" as a
 -              # guess for a shell-script, since we have no idea what the user
 -              # may have configured as the shell path.
 +              # need to be in the exec-path.
                test -x "$1" ||
 -              test "#!" = "$(head -c 2 <"$1")" ||
 +              test "# " = "$(head -c 2 <"$1")" ||
                return;
  
                base=$(basename "$1")
@@@ -767,6 -649,7 +767,6 @@@ else # normal case, use ../bin-wrapper
        fi
  fi
  GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
 -unset GIT_CONFIG
  GIT_CONFIG_NOSYSTEM=1
  GIT_ATTR_NOSYSTEM=1
  export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM
@@@ -947,10 -830,6 +947,10 @@@ test_lazy_prereq SYMLINKS 
        ln -s x y && test -h y
  '
  
 +test_lazy_prereq FILEMODE '
 +      test "$(git config --bool core.filemode)" = true
 +'
 +
  test_lazy_prereq CASE_INSENSITIVE_FS '
        echo good >CamelCase &&
        echo bad >camelcase &&
@@@ -976,6 -855,14 +976,14 @@@ test_lazy_prereq AUTOIDENT 
        git var GIT_AUTHOR_IDENT
  '
  
+ test_lazy_prereq EXPENSIVE '
+       test -n "$GIT_TEST_LONG"
+ '
+ test_lazy_prereq USR_BIN_TIME '
+       test -x /usr/bin/time
+ '
  # When the tests are run as root, permission tests will report that
  # things are writable when they shouldn't be.
  test -w / || test_set_prereq SANITY