diff options
| author | Samuele Pedroni <pedronis@lucediurna.net> | 2016-09-13 19:14:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 19:14:18 +0200 |
| commit | dd64c4015e73475fdca468944bbd06aa8fa587a1 (patch) | |
| tree | d907c91d882be9a2276d643065291b33b1622d31 | |
| parent | 74bac2117ec3608d2e05ca7192b9edd430976565 (diff) | |
| parent | dccbd27e3b3f6860aced4f6ec597fc2fdd15b255 (diff) | |
Merge pull request #1898 from pedronis/cleanout-integration-tests
many: clean out left over references to integration tests
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | cmd/snap/cmd_sign_test.go | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | run-checks | 8 | ||||
| -rw-r--r-- | tests/lib/fakestore/store/store_test.go | 1 | ||||
| -rw-r--r-- | tests/manual-tests.md (renamed from integration-tests/manual-tests.md) | 0 |
6 files changed, 5 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 572bba7ac3..c075f9adab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -integration-tests/bin/ -integration-tests/data/output/ share tags .coverage diff --git a/cmd/snap/cmd_sign_test.go b/cmd/snap/cmd_sign_test.go index fa797542e7..341551e7e7 100644 --- a/cmd/snap/cmd_sign_test.go +++ b/cmd/snap/cmd_sign_test.go @@ -1,5 +1,4 @@ // -*- Mode: Go; indent-tabs-mode: t -*- -// +build !integrationcoverage /* * Copyright (C) 2016 Canonical Ltd diff --git a/debian/rules b/debian/rules index 140b80de6f..ecc1743e52 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DH_OPTIONS export DH_GOPKG := github.com/snapcore/snapd #export DEB_BUILD_OPTIONS=nocheck -export DH_GOLANG_EXCLUDES=integration-tests tests +export DH_GOLANG_EXCLUDES=tests export DH_GOLANG_GO_GENERATE=1 export PATH:=${PATH}:${CURDIR} diff --git a/run-checks b/run-checks index e89dd5b7b7..0e75ee457d 100755 --- a/run-checks +++ b/run-checks @@ -30,7 +30,7 @@ case "${1:-all}" in SPREAD=1 ;; *) - echo "Wrong flag ${1}. To run a single suite use --static, --unit, --spread, or --integration." + echo "Wrong flag ${1}. To run a single suite use --static, --unit, --spread." exit 1 esac @@ -116,12 +116,12 @@ if [ "$UNIT" = 1 ]; then echo "mode: set" > .coverage/coverage.out echo Building - go build -tags=excludeintegration -v github.com/snapcore/snapd/... + go build -v github.com/snapcore/snapd/... # tests echo Running tests from $(pwd) - for pkg in $(go list ./... | grep -v integration-tests); do - $goctest -tags=excludeintegration -v -coverprofile=.coverage/profile.out $pkg + for pkg in $(go list ./...); do + $goctest -v -coverprofile=.coverage/profile.out $pkg append_coverage .coverage/profile.out done diff --git a/tests/lib/fakestore/store/store_test.go b/tests/lib/fakestore/store/store_test.go index d452766305..327fc79d48 100644 --- a/tests/lib/fakestore/store/store_test.go +++ b/tests/lib/fakestore/store/store_test.go @@ -1,5 +1,4 @@ // -*- Mode: Go; indent-tabs-mode: t -*- -// +build !excludeintegration /* * Copyright (C) 2014-2015 Canonical Ltd diff --git a/integration-tests/manual-tests.md b/tests/manual-tests.md index 0217c30057..0217c30057 100644 --- a/integration-tests/manual-tests.md +++ b/tests/manual-tests.md |