test: 7zipped demos

Author: markus-wa

.travis.yml

@@ -14,6 +14,10 @@ matrix:
 env:
   - GO111MODULE=on
 
+before_install:
+  # install 7zip for decompressing test demos
+  - sudo apt-get install -y p7zip-full
+
 # Override Travis's default 'go get' step, since we use Go modules
 install:
   - go mod download
@@ -29,9 +33,6 @@ before_script:
   # Install golangci-lint
   - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.17.1
 
-  # Download test data
-  - pushd test/cs-demos && git lfs pull -I '*' && popd
-
 script:
   # Compile
   - bin/build.sh

README.md

@@ -189,7 +189,10 @@ Running unit tests:
 #### Regression tests
 
 For the full regression suite you will need to download the test demo-set.
-For this, [Git LFS](https://git-lfs.github.com) is required.
+
+Prerequisites:
+- [Git LFS](https://git-lfs.github.com) must be installed
+- [`7z`](https://www.7-zip.org/) must be in your `PATH` environment variable (`p7zip` package on most Linux distros)
 
 Downloading demos + running regression tests:
 

bin/coverage.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-bin/download-test-data.sh
+bin/download-test-data.sh default.7z unexpected_end_of_demo.7z regression-set.7z
 
 # don't cover mocks and generated protobuf code
 coverpkg_ignore='/(fake|msg)'

bin/download-test-data.sh

@@ -2,13 +2,18 @@
 
 set -e
 
-echo 'downloading/updating test data (~ 1 GB), this may take a while ...'
+echo "downloading/updating '$@', this may take a while ..."
 
 git submodule init
 git submodule update
 
 pushd test/cs-demos >/dev/null
-git lfs pull -I '*'
+
+for f in "$@"; do
+	git lfs pull -I $f
+	7z x $f -aoa
+done
+
 popd >/dev/null
 
 echo 'download complete'

bin/git-hooks/link-git-hooks.sh

@@ -33,7 +33,7 @@ echo -n 'this will download ~ 1 GB of test-data (if not already done) [y/N] '
 
 read prePushYesNo
 if [[ "$prePushYesNo" == "y" || "$prePushYesNo" == "Y" ]]; then
-	bin/download-test-data.sh
+	bin/download-test-data.sh default.7z unexpected_end_of_demo.7z regression-set.7z
 	link .git/hooks/pre-push ../../bin/git-hooks/pre-push.sh
 	echo 'added pre-push hook'
 fi

bin/race-tests.sh

@@ -8,4 +8,5 @@ go test -v -race -short ./... -timeout 15m
 
 # run TestDemoInfoCs which is skipped by -short
 # so we at least check one demo with race tests
+bin/download-test-data.sh default.7z
 go test -v -race -run TestDemoInfoCs . -timeout 15m

bin/regression-tests.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-bin/download-test-data.sh
+bin/download-test-data.sh default.7z unexpected_end_of_demo.7z regression-set.7z
 
 go test ./...

demoinfocs_test.go

@@ -34,12 +34,6 @@ const unexpectedEndOfDemoPath = csDemosPath + "/unexpected_end_of_demo.dem"
 
 var concurrentDemos = flag.Int("concurrentdemos", 2, "The `number` of current demos")
 
-func init() {
-	if _, err := os.Stat(defaultDemPath); err != nil {
-		panic(fmt.Sprintf("Failed to read test demo %q", defaultDemPath))
-	}
-}
-
 var update = flag.Bool("update", false, "update .golden files")
 
 func TestDemoInfoCs(t *testing.T) {
@@ -153,7 +147,7 @@ func TestDemoInfoCs(t *testing.T) {
 
 func TestUnexpectedEndOfDemo(t *testing.T) {
 	if testing.Short() {
-		t.Skip("skipping test")
+		t.Skip("skipping test due to -short flag")
 	}
 
 	f := openFile(t, unexpectedEndOfDemoPath)