Browse Source

Merge pull request #905 from slingamn/smoke

add smoke test
tags/v2.1.0-rc1
Shivaram Lingamneni 4 years ago
parent
commit
f4e9c79e36
No account linked to committer's email address
3 changed files with 14 additions and 3 deletions
  1. 5
    0
      .travis.yml
  2. 5
    1
      Makefile
  3. 4
    2
      oragono.go

+ 5
- 0
.travis.yml View File

3
 go:
3
 go:
4
     - "1.14.x"
4
     - "1.14.x"
5
 
5
 
6
+before_install:
7
+  # https://github.com/travis-ci/travis-ci/issues/8361
8
+  - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
9
+
6
 script:
10
 script:
7
 - make
11
 - make
8
 - make test
12
 - make test
13
+- make smoke

+ 5
- 1
Makefile View File

1
-.PHONY: all install build release capdefs test
1
+.PHONY: all install build release capdefs test smoke
2
 
2
 
3
 capdef_file = ./irc/caps/defs.go
3
 capdef_file = ./irc/caps/defs.go
4
 
4
 
29
 	cd irc/passwd && go test . && go vet .
29
 	cd irc/passwd && go test . && go vet .
30
 	cd irc/utils && go test . && go vet .
30
 	cd irc/utils && go test . && go vet .
31
 	./.check-gofmt.sh
31
 	./.check-gofmt.sh
32
+
33
+smoke:
34
+	oragono mkcerts --conf ./oragono.yaml || true
35
+	oragono run --conf ./oragono.yaml --smoke

+ 4
- 2
oragono.go View File

98
 	oragono genpasswd [--conf <filename>] [--quiet]
98
 	oragono genpasswd [--conf <filename>] [--quiet]
99
 	oragono mkcerts [--conf <filename>] [--quiet]
99
 	oragono mkcerts [--conf <filename>] [--quiet]
100
 	oragono mksecret [--conf <filename>] [--quiet]
100
 	oragono mksecret [--conf <filename>] [--quiet]
101
-	oragono run [--conf <filename>] [--quiet]
101
+	oragono run [--conf <filename>] [--quiet] [--smoke]
102
 	oragono -h | --help
102
 	oragono -h | --help
103
 	oragono --version
103
 	oragono --version
104
 Options:
104
 Options:
197
 			logman.Info("server", "Server running")
197
 			logman.Info("server", "Server running")
198
 			defer logman.Info("server", fmt.Sprintf("Oragono v%s exiting", irc.SemVer))
198
 			defer logman.Info("server", fmt.Sprintf("Oragono v%s exiting", irc.SemVer))
199
 		}
199
 		}
200
-		server.Run()
200
+		if !arguments["--smoke"].(bool) {
201
+			server.Run()
202
+		}
201
 	}
203
 	}
202
 }
204
 }

Loading…
Cancel
Save