status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: change default http_max_conns_per_client to 250 to ease tests (#7625) 

On recent Mac OS versions, the ulimit defaults to 256 by default, but many
systems (eg: some Linux distributions) often limit this value to 1024.

On validation of configuration, Consul now validates that the number of
allowed files descriptors is bigger than http_max_conns_per_client.

This make some unit tests failing on Mac OS.
Use a less important value in unit test, so tests runs well by default
on Mac OS without need for tuning the OS.
This commit is contained in:
Pierre Souchay 2020-04-09 11:11:42 +02:00 committed by GitHub
parent 7f03949424
commit 4a6569a4e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/config/runtime_test.go
View File

@ -4076,7 +4076,7 @@ func TestFullConfig(t *testing.T) {
"key_file": "IEkkwgIA", "key_file": "IEkkwgIA",
"leave_on_terminate": true, "leave_on_terminate": true,
"limits": { "limits": {
"http_max_conns_per_client": 9283, "http_max_conns_per_client": 250,
"https_handshake_timeout": "2391ms", "https_handshake_timeout": "2391ms",
"rpc_handshake_timeout": "1932ms", "rpc_handshake_timeout": "1932ms",
"rpc_rate": 12029.43, "rpc_rate": 12029.43,
@ -4709,7 +4709,7 @@ func TestFullConfig(t *testing.T) {
key_file = "IEkkwgIA" key_file = "IEkkwgIA"
leave_on_terminate = true leave_on_terminate = true
limits { limits {
http_max_conns_per_client = 9283 http_max_conns_per_client = 250
https_handshake_timeout = "2391ms" https_handshake_timeout = "2391ms"
rpc_handshake_timeout = "1932ms" rpc_handshake_timeout = "1932ms"
rpc_rate = 12029.43 rpc_rate = 12029.43
@ -5416,7 +5416,7 @@ func TestFullConfig(t *testing.T) {
HTTPPort: 7999, HTTPPort: 7999,
HTTPResponseHeaders: map[string]string{"M6TKa9NP": "xjuxjOzQ", "JRCrHZed": "rl0mTx81"}, HTTPResponseHeaders: map[string]string{"M6TKa9NP": "xjuxjOzQ", "JRCrHZed": "rl0mTx81"},
HTTPSAddrs: []net.Addr{tcpAddr("95.17.17.19:15127")}, HTTPSAddrs: []net.Addr{tcpAddr("95.17.17.19:15127")},
HTTPMaxConnsPerClient: 9283, HTTPMaxConnsPerClient: 250,
HTTPSHandshakeTimeout: 2391 * time.Millisecond, HTTPSHandshakeTimeout: 2391 * time.Millisecond,
HTTPSPort: 15127, HTTPSPort: 15127,
KeyFile: "IEkkwgIA", KeyFile: "IEkkwgIA",