Skip to content

Commit b3a78f1

Browse files
committed
Fixed tests in the PR workflow
1 parent d780290 commit b3a78f1

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/testing.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ jobs:
4343
go-version: ^1.17
4444
- name: Check out code
4545
uses: actions/checkout@v2
46-
- name: Run tests
47-
run: go test -cover ./... -coverprofile=coverage.txt -covermode=atomic
46+
- name: Run unit tests
47+
run: make test-unit
48+
- name: Run examples tests
49+
run: make test-examples
50+
- name: Run integration tests
51+
run: make test-integration
4852
env:
4953
POSTGRES_DSN: postgres://goengine:goengine@localhost:${{ job.services.postgres.ports[5432] }}/goengine?sslmode=disable

docker-compose.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
version: '2'
1+
version: '3'
22

33
services:
44
postgres:
55
image: postgres:10.3
66
ports:
7-
- '8043:5432'
7+
- '8043:5432'
8+
tmpfs:
9+
- /var/lib/postgresql
810
environment:
911
LC_ALL: C.UTF-8
1012
POSTGRES_DB: goengine
1113
POSTGRES_USER: goengine
1214
POSTGRES_PASSWORD: goengine
15+
healthcheck:
16+
test: [ "CMD", "pg_isready" ]
17+
interval: 10s
18+
timeout: 5s
19+
retries: 5

extension/amqp/listener_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestListener_Listen(t *testing.T) {
108108
interval := consumeCalls[i].Sub(consumeCalls[i-1])
109109

110110
if expectedInterval > interval || interval > (expectedInterval+time.Millisecond*2) {
111-
assert.Fail(t, fmt.Sprintf("Invalid interval after consume %d (got %s expected between %s and %s)", i, interval, expectedInterval, (expectedInterval+time.Millisecond)))
111+
assert.Fail(t, fmt.Sprintf("Invalid interval after consume %d (got %s expected between %s and %s)", i, interval, expectedInterval, expectedInterval+time.Millisecond))
112112
}
113113
}
114114

test/internal/postgres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func postgresDSN(t *testing.T) string {
214214
parsedDSN += " application_name=" + postgressAppName
215215
}
216216

217-
parsedDSN = regexp.MustCompile(`dbname=((?:(\\ )|[^ ])+)`).
217+
parsedDSN = regexp.MustCompile(`dbname='((?:(\\ )|[^ ])+)'`).
218218
ReplaceAllString(parsedDSN, fmt.Sprintf("dbname=${1}-%d", time.Now().UnixNano()))
219219

220220
return parsedDSN

0 commit comments

Comments
 (0)