move tests to internal/ and update travis.yml file.

Author: xiam

.travis.yml

@@ -1,31 +1,28 @@
-sudo: false
+dist: bionic
+
+sudo: required
 
 notifications:
   email: false
 
 language: go
 
 go:
-  - 1.11.x
-  - 1.12.x
-  - 1.13.x
+  - "1.12"
+  - "1.13"
+
+services:
+  - docker
 
 env:
   global:
   - GOARCH=amd64
   - TEST_HOST=127.0.0.1
 
-addons:
-  postgresql: "10"
-  apt:
-    packages:
-    - postgresql-10
-    - postgresql-client-10
-
 before_install:
-  - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
-  - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
-  - "sudo service postgresql restart 10"
+  - sudo service mysql stop
+  - sudo service postgresql stop
+  - sleep 10
 
 install:
   - mkdir -p $GOPATH/src/upper.io
@@ -35,4 +32,5 @@ install:
   - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/bond
 
 script:
-  - make test
+  - make -C internal/tests server-up test server-down
+

Makefile internal/tests/MakefileMakefile renamed to internal/tests/Makefile

@@ -1,23 +1,32 @@
+PROJECT      ?= bond
+
 DB_HOST      ?= 127.0.0.1
 DB_PORT      ?= 5432
 DB_USER      ?= postgres
-DB_PASSWORD  ?=
+DB_PASSWORD  ?= postgr3s
 
 BOND_DB         ?= bond_test
 BOND_USER       ?= bond_user
 BOND_PASSWORD   ?= bond_password
 
 TEST_FLAGS ?=
 
-all: test
+export POSTGRES_VERSION
 
-build:
-	@go build
+export DB_HOST
+export DB_NAME
+export DB_PASSWORD
+export DB_PORT
+export DB_USERNAME
 
-test: resetdb
+export TEST_FLAGS
+
+all: test
+
+test: db-reset
 	UPPERIO_DB_DEBUG=1 go test -v ./... $(TEST_FLAGS)
 
-resetdb:
+db-reset:
 	export PGPASSWORD="$(DB_PASSWORD)" && \
 	psql -U$(DB_USER) -h$(DB_HOST) -p$(DB_PORT) -c "DROP DATABASE IF EXISTS $(BOND_DB)" && \
 	psql -U$(DB_USER) -h$(DB_HOST) -p$(DB_PORT) -c "DROP ROLE IF EXISTS $(BOND_USER)" && \
@@ -26,3 +35,10 @@ resetdb:
 	psql -U$(DB_USER) -h$(DB_HOST) -p$(DB_PORT) -c "GRANT ALL PRIVILEGES ON DATABASE $(BOND_DB) TO $(BOND_USER)"
 	export PGPASSWORD="$(BOND_PASSWORD)" && \
 	psql -U$(BOND_USER) -h$(DB_HOST) -p$(DB_PORT) $(BOND_DB) < test_schema.sql
+
+server-up: server-down
+	docker-compose -p $(PROJECT) up -d && \
+	sleep 10
+
+server-down:
+	docker-compose -p $(PROJECT) down

bond_test.go internal/tests/bond_test.gobond_test.go renamed to internal/tests/bond_test.go

@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+
+  server:
+    image: postgres:${POSTGRES_VERSION:-11}
+    environment:
+      POSTGRES_USER: ${DB_USERNAME:-postgres}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-postgr3s}
+    ports:
+      - '${DB_HOST:-127.0.0.1}:${DB_PORT:-5432}:5432'
+