Skip to content

Commit e5bc55c

Browse files
committed
chore(tests): use go 1.5 toolchain
Since some integration tests will fail with concurrent goroutines, this change also sets GOMAXPROCS=1 for when running them.
1 parent 101bbba commit e5bc55c

4 files changed

Lines changed: 20 additions & 18 deletions

File tree

Godeps/Godeps.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/contributing/hacking.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ At a glance, you will need:
3434

3535
- Python 2.7 or later (with ``pip``)
3636
- virtualenv (``sudo pip install virtualenv``)
37-
- Go 1.4 or later, with support for compiling to ``linux/amd64``
37+
- Go 1.5 or later, with support for compiling to ``linux/amd64``
3838
- Godep (https://github.com/tools/godep)
3939
- VirtualBox latest
4040
- Vagrant 1.5 or later
@@ -63,7 +63,7 @@ It is also straightforward to build Go from source:
6363
.. code-block:: console
6464
6565
$ sudo su
66-
$ curl -sSL https://golang.org/dl/go1.4.src.tar.gz | tar -v -C /usr/local -xz
66+
$ curl -sSL https://golang.org/dl/go1.5.src.tar.gz | tar -v -C /usr/local -xz
6767
$ cd /usr/local/go/src
6868
$ # compile Go for our default platform first, then add cross-compile support
6969
$ ./make.bash --no-clean
@@ -76,7 +76,7 @@ Configuring Docker Machine (Mac)
7676
````````````````````````````````
7777

7878
Deis needs a Docker registry running independently of the Deis cluster. On
79-
OS X, you will need Docker Machine (http://docs.docker.com/machine/install-machine/)
79+
OS X, you will need Docker Machine (http://docs.docker.com/machine/install-machine/)
8080
to run the registry inside of a VirtualBox image.
8181

8282
.. note::

tests/Makefile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,23 @@ TEST_POSTGRESQL_IMAGE = $(IMAGE_PREFIX)test-postgresql:$(BUILD_TAG)
1414
test: test-smoke
1515

1616
test-smoke: test-style
17-
godep go test -tags integration -short -timeout 20m -v -run TestSmoke
17+
# TODO: remove GOMAXPROCS=1 when concurrent stdout issues are fixed
18+
GOMAXPROCS=1 godep go test -tags integration -short -timeout 20m -v -run TestSmoke
1819

1920
test-full: test-style
20-
godep go test -tags integration -v -run TestGlobal
21-
godep go test -tags integration -v -run TestApps
22-
godep go test -tags integration -v -run TestAuth
23-
godep go test -tags integration -v -run TestBuilds
24-
godep go test -tags integration -v -run TestConfig
25-
godep go test -tags integration -v -run TestDomains
26-
godep go test -tags integration -v -run TestHealthcheck
27-
godep go test -tags integration -v -run TestKeys
28-
godep go test -tags integration -v -run TestPerms
29-
godep go test -tags integration -v -run TestPs
30-
godep go test -tags integration -v -run TestReleases
31-
godep go test -tags integration -v -run TestUsers
21+
# TODO: remove GOMAXPROCS=1 when concurrent stdout issues are fixed
22+
GOMAXPROCS=1 godep go test -tags integration -v -run TestGlobal
23+
GOMAXPROCS=1 godep go test -tags integration -v -run TestApps
24+
GOMAXPROCS=1 godep go test -tags integration -v -run TestAuth
25+
GOMAXPROCS=1 godep go test -tags integration -v -run TestBuilds
26+
GOMAXPROCS=1 godep go test -tags integration -v -run TestConfig
27+
GOMAXPROCS=1 godep go test -tags integration -v -run TestDomains
28+
GOMAXPROCS=1 godep go test -tags integration -v -run TestHealthcheck
29+
GOMAXPROCS=1 godep go test -tags integration -v -run TestKeys
30+
GOMAXPROCS=1 godep go test -tags integration -v -run TestPerms
31+
GOMAXPROCS=1 godep go test -tags integration -v -run TestPs
32+
GOMAXPROCS=1 godep go test -tags integration -v -run TestReleases
33+
GOMAXPROCS=1 godep go test -tags integration -v -run TestUsers
3234

3335
mock-store:
3436
docker build -t $(MOCK_STORE_IMAGE) fixtures/mock-store/

tests/bin/setup-node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if ! vagrant -v &> /dev/null; then
5050
fi
5151

5252
# install go
53-
wget -nv -O- https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -C /usr/local -xz
53+
wget -nv -O- https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz | tar -C /usr/local -xz
5454
echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
5555
echo "You must reboot for the global $PATH changes to take effect."
5656

0 commit comments

Comments
 (0)