Skip to content

Commit

Permalink
Merge pull request #4 from bitnami-labs/fix-cicd
Browse files Browse the repository at this point in the history
Bump Go version and remove incompatible test
  • Loading branch information
javsalgar authored Jun 22, 2020
2 parents 64a8e1c + 847a14f commit c694622
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: go
go:
- 1.7
- 1.8
- 1.9
- 1.13
- 1.12
- 1.11
os:
- linux
install:
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ TOOLS := $(shell ls ./cmd)
all:
make $(TOOLS)


$(TOOLS):
make -C ./cmd/$@

Expand Down Expand Up @@ -53,4 +52,3 @@ godep-restore-%:
get-build-deps:
@echo "+ Downloading build dependencies"
@go get github.com/tools/godep
@go get github.com/golang/lint/golint
4 changes: 2 additions & 2 deletions cmd/smtp-checker/apps/wordpress/smtp-wordpress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestParseWPDatabaseConfig(t *testing.T) {
t.Errorf("Incorrect database host detected, expected: localhost, got: %s", database.Host)
}
if database.Port != 3306 {
t.Errorf("Incorrect database port detected, expected: 3306, got: %s", database.Port)
t.Errorf("Incorrect database port detected, expected: 3306, got: %d", database.Port)
}
if database.Name != "bitnami_wordpress" {
t.Errorf("Incorrect database name detected, expected: bitnami_wordpress, got: %s", database.Name)
Expand Down Expand Up @@ -87,7 +87,7 @@ func TestObtainSMTP(t *testing.T) {
t.Errorf("Incorrect SMTP host detected, expected: smtp.gmail.com, got: %s", smtp.Host)
}
if smtp.Port != 587 {
t.Errorf("Incorrect SMTP port detected, expected: 587, got: %s", smtp.Port)
t.Errorf("Incorrect SMTP port detected, expected: 587, got: %d", smtp.Port)
}
if smtp.Pass != "XXXXXXXX" {
t.Errorf("Incorrect SMTP password detected, expected: XXXXXXXX, got: %s", smtp.Pass)
Expand Down
9 changes: 0 additions & 9 deletions cmd/smtp-checker/smtpchecks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ import (
"testing"
)

func TestRunConnectivityChecks(t *testing.T) {
t.Run("Check connectivity with SMTP server", func(t *testing.T) {
err := RunConnectivityChecks("smtp.gmail.com", 25)
if err != nil {
t.Errorf("error connecting to smtp server: %v", err)
}
})
}

func TestRunTLSConnectivityChecks(t *testing.T) {
t.Run("Check connectivity with SMTP server via TLS", func(t *testing.T) {
err := RunTLSConnectivityChecks("smtp.gmail.com", 465)
Expand Down

0 comments on commit c694622

Please sign in to comment.