From cae4e108fc91bb8a1dd0f053e815df46d7f0032c Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 24 Mar 2020 09:53:04 -0400 Subject: [PATCH 1/4] add --smoke option --- oragono.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oragono.go b/oragono.go index dcf0f43e..6b2ee832 100644 --- a/oragono.go +++ b/oragono.go @@ -98,7 +98,7 @@ Usage: oragono genpasswd [--conf ] [--quiet] oragono mkcerts [--conf ] [--quiet] oragono mksecret [--conf ] [--quiet] - oragono run [--conf ] [--quiet] + oragono run [--conf ] [--quiet] [--smoke] oragono -h | --help oragono --version Options: @@ -197,6 +197,8 @@ Options: logman.Info("server", "Server running") defer logman.Info("server", fmt.Sprintf("Oragono v%s exiting", irc.SemVer)) } - server.Run() + if !arguments["--smoke"].(bool) { + server.Run() + } } } From bfab8adb70adc6d4a2b5b4d99cfdc186d357e971 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 24 Mar 2020 09:56:12 -0400 Subject: [PATCH 2/4] add smoke target --- .travis.yml | 1 + Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b93dc168..623c6625 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,4 @@ go: script: - make - make test +- make smoke diff --git a/Makefile b/Makefile index 6888b05c..a1694cbc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all install build release capdefs test +.PHONY: all install build release capdefs test smoke capdef_file = ./irc/caps/defs.go @@ -29,3 +29,6 @@ test: cd irc/passwd && go test . && go vet . cd irc/utils && go test . && go vet . ./.check-gofmt.sh + +smoke: + oragono run --conf ./oragono.yaml --smoke From 1195295877af098ea11979df2f9e9db447d63157 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 24 Mar 2020 10:01:35 -0400 Subject: [PATCH 3/4] fix smoke test spurious failure on missing certs --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a1694cbc..eb2500d4 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,5 @@ test: ./.check-gofmt.sh smoke: + oragono mkcerts --conf ./oragono.yaml || true oragono run --conf ./oragono.yaml --smoke From 2bb513fba5aa0df637d6302474e697db83781c9f Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 24 Mar 2020 10:14:16 -0400 Subject: [PATCH 4/4] attempt to enable ipv6 on travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 623c6625..0f03c4a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ language: go go: - "1.14.x" +before_install: + # https://github.com/travis-ci/travis-ci/issues/8361 + - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6' + script: - make - make test