lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #790 from github/golang-test-runner

Browse Source 
rewrite test runner in go to reduce output race conditions
This commit is contained in:
risk danger olson 2015-10-26 16:25:53 -07:00
commit b921667f8f
9 changed files with 163 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/fmt
View File

@ -6,7 +6,7 @@ hash goimports 2>/dev/null && {
}
# don't run gofmt in these directories
ignored=(/bin/ /docs/ /log/ /man/ /tmp/ /vendor/)
ignored=(/bin/ /docs/ /log/ /man/ /tmp/ /vendor/ /rpm/ /docker/ /debian/)
for i in */ ; do
if [[ ! ${ignored[*]} =~ "/$i" ]]; then
$formatter -w -l "$@" "${i%?}"

14
script/integration
View File

@ -5,7 +5,6 @@ set -e
SHUTDOWN_LFS=no
SHOW_LOGS=yes
TESTS=( "$@" )
atexit() {
res=${1:-$?}
@ -47,15 +46,4 @@ parallel=${GIT_LFS_TEST_MAXPROCS:-4}
echo "Running this maxprocs=$parallel"
echo
if [ ${#TESTS[@]} -eq 0 ]
then
testfiles=(test/test-*.sh)
else
for ((i=0; i<${#TESTS[@]}; i++)); do
testfiles[i]=test/test-${TESTS[i]}.sh
done
fi
for file in "${testfiles[@]}"; do
echo "0$(cat .$(basename $file).time 2>/dev/null || true) $file"
done | sort -rnk1 | awk '{ print $2 }' | xargs -I % -P $parallel -n 1 /bin/bash % --batch
GIT_LFS_TEST_MAXPROCS=$parallel GIT_LFS_TEST_DIR="$GIT_LFS_TEST_DIR" SHUTDOWN_LFS="no" go run script/*.go -cmd integration "$@"

121
script/integration.go Normal file
View File

@ -0,0 +1,121 @@
package main
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"regexp"
"strings"
"sync"
)
var (
erroring = false
maxprocs = 4
testPattern = regexp.MustCompile(`test/test-([a-z\-]+)\.sh`)
)
func mainIntegration() {
if maxprocs < 1 {
maxprocs = 1
}
files := testFiles()
if len(files) == 0 {
fmt.Println("no tests to run")
os.Exit(1)
}
var wg sync.WaitGroup
tests := make(chan string, len(files))
output := make(chan string, len(files))
for _, file := range files {
tests <- file
}
go printOutput(output)
for i := 0; i < maxprocs; i++ {
wg.Add(1)
go worker(tests, output, &wg)
}
close(tests)
wg.Wait()
close(output)
printOutput(output)
if erroring {
os.Exit(1)
}
}
func runTest(output chan string, test string) {
out, err := exec.Command("/bin/bash", test).CombinedOutput()
if err != nil {
erroring = true
}
output <- strings.TrimSpace(string(out))
}
func printOutput(output <-chan string) {
for {
select {
case out, ok := <-output:
if !ok {
return
}
fmt.Println(out)
}
}
}
func worker(tests <-chan string, output chan string, wg *sync.WaitGroup) {
defer wg.Done()
for {
select {
case testname, ok := <-tests:
if !ok {
return
}
runTest(output, testname)
}
}
}
func testFiles() []string {
if len(os.Args) < 4 {
return allTestFiles()
}
fileMap := make(map[string]bool)
for _, file := range allTestFiles() {
fileMap[file] = true
}
files := make([]string, 0, len(os.Args)-3)
for _, arg := range os.Args {
fullname := "test/test-" + arg + ".sh"
if fileMap[fullname] {
files = append(files, fullname)
}
}
return files
}
func allTestFiles() []string {
files := make([]string, 0, 100)
filepath.Walk("test", func(path string, info os.FileInfo, err error) error {
if err != nil || info.IsDir() || !testPattern.MatchString(path) {
return nil
}
files = append(files, path)
return nil
})
return files
}

2
script/script.go
View File

@ -19,6 +19,8 @@ func main() {
mainBuild()
case "release":
mainRelease()
case "integration":
mainIntegration()
default:
log.Fatalln("Unknown command:", *SubCommand)
}

35
test/test-init.sh
View File

@ -6,13 +6,16 @@ begin_test "init again"
(
set -e
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
smudge="$(git config filter.lfs.smudge)"
clean="$(git config filter.lfs.clean)"
printf "$smudge" | grep "git-lfs smudge"
printf "$clean" | grep "git-lfs clean"
git lfs init
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "$smudge" = "$(git config filter.lfs.smudge)" ]
[ "$clean" = "$(git config filter.lfs.clean)" ]
)
end_test
@ -34,12 +37,12 @@ begin_test "init with old settings"
grep -E "(clean|smudge) attribute should be" init.log
[ `grep -c "(MISSING)" init.log` = "0" ]
[ "git lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "git lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
[ "git lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
git lfs init --force
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
)
end_test
@ -85,7 +88,7 @@ Git LFS initialized."
Git LFS initialized." = "$(git lfs init --force)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
[ -n "$LFS_DOCKER" ] && exit 0
has_test_dir || exit 0
echo "test with bare repository"
cd ..
@ -127,16 +130,16 @@ begin_test "init --skip-smudge"
set -e
git lfs init
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
[ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
git lfs init --skip-smudge
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "git-lfs smudge --skip %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
[ "git-lfs smudge --skip %f" = "$(git config --global filter.lfs.smudge)" ]
git lfs init --force
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config --global filter.lfs.clean)" ]
[ "git-lfs smudge %f" = "$(git config --global filter.lfs.smudge)" ]
)
end_test
@ -169,7 +172,7 @@ begin_test "init --local outside repository"
set +e
[ -n "$LFS_DOCKER" ] && exit 0
has_test_dir || exit 0
git lfs init --local 2> err.log
res=$?

11
test/test-uninit.sh
View File

@ -6,8 +6,11 @@ begin_test "uninit outside repository"
(
set -e
[ "git-lfs smudge %f" = "$(git config filter.lfs.smudge)" ]
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
smudge="$(git config filter.lfs.smudge)"
clean="$(git config filter.lfs.clean)"
printf "$smudge" | grep "git-lfs smudge"
printf "$clean" | grep "git-lfs clean"
# uninit multiple times to trigger https://github.com/github/git-lfs/issues/529
git lfs uninit
@ -15,8 +18,8 @@ begin_test "uninit outside repository"
git lfs uninit | tee uninit.log
grep "configuration has been removed" uninit.log
[ "" = "$(git config filter.lfs.smudge)" ]
[ "" = "$(git config filter.lfs.clean)" ]
[ "" = "$(git config --global filter.lfs.smudge)" ]
[ "" = "$(git config --global filter.lfs.clean)" ]
cat $HOME/.gitconfig
[ "$(grep 'filter "lfs"' $HOME/.gitconfig -c)" = "0" ]

2
test/test-update.sh
View File

@ -68,7 +68,7 @@ Run \`git lfs update --force\` to overwrite this hook."
[ "Updated pre-push hook." = "$(git lfs update --force)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
[ -n "$LFS_DOCKER" ] && exit 0
has_test_dir || exit 0
echo "test with bare repository"
cd ..

9
test/testhelpers.sh
View File

@ -227,6 +227,7 @@ setup() {
echo
echo "HOME: $HOME"
echo "TMP: $TMPDIR"
echo "CREDS: $CREDSDIR"
echo "lfstest-gitserver:"
echo " LFSTEST_URL=$LFS_URL_FILE"
echo " LFSTEST_DIR=$REMOTEDIR"
@ -425,8 +426,14 @@ contains_same_elements() {
exit $res
}
is_stdin_attached() {
test -t0
echo $?
}
has_test_dir() {
if [ -z "$GIT_LFS_TEST_DIR" ]; then
echo "No GIT_LFS_TEST_DIR. Skipping..."
exit 0
fi
}