technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: use "return" action in upstream tests.

Browse Source
This commit is contained in:
Andrei Zeliankou
2020-04-03 01:49:18 +01:00
parent d7aa514d6a
commit a49023229e
5 changed files with 101 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/python/delayed/wsgi.py
View File

@@ -11,6 +11,7 @@ def application(environ, start_response):
write = start_response('200', [('Content-Length', str(len(body)))]) write = start_response('200', [('Content-Length', str(len(body)))])
if not body: if not body:
time.sleep(delay)
return [] return []
step = int(len(body) / parts) step = int(len(body) / parts)

8
test/python/upstreams/0/wsgi.py
View File

@@ -1,8 +0,0 @@
import time
def application(env, start_response):
delay = int(env.get('HTTP_X_DELAY', 0))
start_response('200', [('Content-Length', '0'), ('X-Upstream', '0')])
time.sleep(delay)
return []

8
test/python/upstreams/1/wsgi.py
View File

@@ -1,8 +0,0 @@
import time
def application(env, start_response):
delay = int(env.get('HTTP_X_DELAY', 0))
start_response('200', [('Content-Length', '0'), ('X-Upstream', '1')])
time.sleep(delay)
return []

8
test/python/upstreams/2/wsgi.py
View File

@@ -1,8 +0,0 @@
import time
def application(env, start_response):
delay = int(env.get('HTTP_X_DELAY', 0))
start_response('200', [('Content-Length', '0'), ('X-Upstream', '2')])
time.sleep(delay)
return []

174
test/test_upstreams_rr.py
View File

@@ -16,10 +16,10 @@ class TestUpstreamsRR(TestApplicationPython):
{ {
"listeners": { "listeners": {
"*:7080": {"pass": "upstreams/one"}, "*:7080": {"pass": "upstreams/one"},
"*:7081": {"pass": "applications/ups_0"},
"*:7082": {"pass": "applications/ups_1"},
"*:7083": {"pass": "applications/ups_2"},
"*:7090": {"pass": "upstreams/two"}, "*:7090": {"pass": "upstreams/two"},
"*:7081": {"pass": "routes/one"},
"*:7082": {"pass": "routes/two"},
"*:7083": {"pass": "routes/three"},
}, },
"upstreams": { "upstreams": {
"one": { "one": {
@@ -35,32 +35,12 @@ class TestUpstreamsRR(TestApplicationPython):
}, },
}, },
}, },
"applications": { "routes": {
"ups_0": { "one": [{"action": {"return": 200}}],
"type": "python", "two": [{"action": {"return": 201}}],
"processes": {"spare": 0}, "three": [{"action": {"return": 202}}],
"path": self.current_dir + "/python/upstreams/0",
"working_directory": self.current_dir
+ "/python/upstreams/0",
"module": "wsgi",
},
"ups_1": {
"type": "python",
"processes": {"spare": 0},
"path": self.current_dir + "/python/upstreams/1",
"working_directory": self.current_dir
+ "/python/upstreams/1",
"module": "wsgi",
},
"ups_2": {
"type": "python",
"processes": {"spare": 0},
"path": self.current_dir + "/python/upstreams/2",
"working_directory": self.current_dir
+ "/python/upstreams/2",
"module": "wsgi",
},
}, },
"applications": {},
}, },
), ),
'upstreams initial configuration', 'upstreams initial configuration',
@@ -70,15 +50,17 @@ class TestUpstreamsRR(TestApplicationPython):
def get_resps(self, req=100, port=7080): def get_resps(self, req=100, port=7080):
resps = [0] resps = [0]
for _ in range(req): for _ in range(req):
headers = self.get(port=port)['headers'] status = self.get(port=port)['status']
if 'X-Upstream' in headers: if 200 > status or status > 209:
ups = int(headers['X-Upstream']) continue
if ups > len(resps) - 1: ups = status % 10
resps.extend([0] * (ups - len(resps) + 1)) if ups > len(resps) - 1:
resps.extend([0] * (ups - len(resps) + 1))
resps[ups] += 1 resps[ups] += 1
return resps return resps
@@ -97,16 +79,19 @@ Connection: close
""" """
resp = self.http(to_send, raw_resp=True, raw=True, port=port) resp = self.http(to_send, raw_resp=True, raw=True, port=port)
ups = re.findall('X-Upstream: (\d+)', resp) status = re.findall(r'HTTP\/\d\.\d\s(\d\d\d)', resp)
resps = [0] * (int(max(ups)) + 1) status = list(filter(lambda x: x[:2] == '20', status))
ups = list(map(lambda x: int(x[-1]), status))
resps = [0] * (max(ups) + 1)
for i in range(len(ups)): for i in range(len(ups)):
resps[int(ups[i])] += 1 resps[ups[i]] += 1
return resps return resps
def test_upstreams_rr_no_weight(self): def test_upstreams_rr_no_weight(self):
resps = self.get_resps() resps = self.get_resps()
self.assertEqual(sum(resps), 100, 'no weight sum')
self.assertLessEqual( self.assertLessEqual(
abs(resps[0] - resps[1]), self.cpu_count, 'no weight' abs(resps[0] - resps[1]), self.cpu_count, 'no weight'
) )
@@ -127,6 +112,7 @@ Connection: close
) )
resps = self.get_resps() resps = self.get_resps()
self.assertEqual(sum(resps), 100, 'no weight 3 sum')
self.assertLessEqual( self.assertLessEqual(
abs(resps[0] - resps[1]), self.cpu_count, 'no weight 3' abs(resps[0] - resps[1]), self.cpu_count, 'no weight 3'
) )
@@ -138,6 +124,7 @@ Connection: close
) )
resps = self.get_resps() resps = self.get_resps()
self.assertEqual(sum(resps), 100, 'no weight 4 sum')
self.assertLessEqual( self.assertLessEqual(
max(resps) - min(resps), self.cpu_count, 'no weight 4' max(resps) - min(resps), self.cpu_count, 'no weight 4'
) )
@@ -295,33 +282,71 @@ Connection: close
r_one = sum_resps(r_one, self.get_resps(req=10)) r_one = sum_resps(r_one, self.get_resps(req=10))
r_two = sum_resps(r_two, self.get_resps(req=10, port=7090)) r_two = sum_resps(r_two, self.get_resps(req=10, port=7090))
self.assertEqual(sum(r_one), 100, 'dep one mix sum')
self.assertLessEqual( self.assertLessEqual(
abs(r_one[0] - r_one[1]), self.cpu_count, 'dep one mix' abs(r_one[0] - r_one[1]), self.cpu_count, 'dep one mix'
) )
self.assertEqual(sum(r_two), 100, 'dep two mix sum')
self.assertLessEqual( self.assertLessEqual(
abs(r_two[0] - r_two[1]), self.cpu_count, 'dep two mix' abs(r_two[0] - r_two[1]), self.cpu_count, 'dep two mix'
) )
def test_upstreams_rr_delay(self): def test_upstreams_rr_delay(self):
headers_delay_1 = { self.assertIn(
'Connection': 'close', 'success',
'Host': 'localhost', self.conf(
'Content-Length': '0', {
'X-Delay': '1', "listeners": {
} "*:7080": {"pass": "upstreams/one"},
headers_no_delay = { "*:7081": {"pass": "routes"},
'Connection': 'close', "*:7082": {"pass": "routes"},
'Host': 'localhost', },
'Content-Length': '0', "upstreams": {
} "one": {
"servers": {
"127.0.0.1:7081": {},
"127.0.0.1:7082": {},
},
},
},
"routes": [
{
"match": {"destination": "*:7081"},
"action": {"pass": "applications/delayed"},
},
{
"match": {"destination": "*:7082"},
"action": {"return": 201},
},
],
"applications": {
"delayed": {
"type": "python",
"processes": {"spare": 0},
"path": self.current_dir + "/python/delayed",
"working_directory": self.current_dir
+ "/python/delayed",
"module": "wsgi",
}
},
},
),
'upstreams initial configuration',
)
req = 50 req = 50
socks = [] socks = []
for i in range(req): for i in range(req):
headers = headers_delay_1 if i % 5 == 0 else headers_no_delay delay = 1 if i % 5 == 0 else 0
_, sock = self.get( _, sock = self.get(
headers=headers, headers={
'Host': 'localhost',
'Content-Length': '0',
'X-Delay': str(delay),
'Connection': 'close',
},
start=True, start=True,
no_recv=True, no_recv=True,
) )
@@ -332,12 +357,12 @@ Connection: close
resp = self.recvall(socks[i]).decode() resp = self.recvall(socks[i]).decode()
socks[i].close() socks[i].close()
m = re.search('X-Upstream: (\d+)', resp) m = re.search('HTTP/1.1 20(\d)', resp)
self.assertIsNotNone(m, 'status')
resps[int(m.group(1))] += 1 resps[int(m.group(1))] += 1
self.assertLessEqual( self.assertEqual(sum(resps), req, 'delay sum')
abs(resps[0] - resps[1]), self.cpu_count, 'dep two mix' self.assertLessEqual(abs(resps[0] - resps[1]), self.cpu_count, 'delay')
)
def test_upstreams_rr_active_req(self): def test_upstreams_rr_active_req(self):
conns = 5 conns = 5
@@ -364,7 +389,7 @@ Connection: close
# Send one more request and read response to make sure that previous # Send one more request and read response to make sure that previous
# requests had enough time to reach server. # requests had enough time to reach server.
self.assertEqual(self.get()['status'], 200) self.assertEqual(self.get()['body'], '')
self.assertIn( self.assertIn(
'success', 'success',
@@ -388,13 +413,17 @@ Connection: close
) )
for i in range(conns): for i in range(conns):
resp = self.recvall(socks[i]).decode() self.assertEqual(
socks[i].close() self.http(b'', sock=socks[i], raw=True)['body'],
'',
'active req GET',
)
self.assertRegex(resp, r'X-Upstream', 'active req GET') self.assertEqual(
self.http(b"""0123456789""", sock=socks2[i], raw=True)['body'],
resp = self.http(b"""0123456789""", sock=socks2[i], raw=True) '',
self.assertEqual(resp['status'], 200, 'active req POST') 'active req POST',
)
def test_upstreams_rr_bad_server(self): def test_upstreams_rr_bad_server(self):
self.assertIn( self.assertIn(
@@ -417,14 +446,11 @@ Connection: close
def test_upstreams_rr_post(self): def test_upstreams_rr_post(self):
resps = [0, 0] resps = [0, 0]
for _ in range(50): for _ in range(50):
resps[ resps[self.get()['status'] % 10] += 1
int(self.post(body='0123456789')['headers']['X-Upstream']) resps[self.post(body='0123456789')['status'] % 10] += 1
] += 1
resps[int(self.get()['headers']['X-Upstream'])] += 1
self.assertLessEqual( self.assertEqual(sum(resps), 100, 'post sum')
abs(resps[0] - resps[1]), self.cpu_count, 'post' self.assertLessEqual(abs(resps[0] - resps[1]), self.cpu_count, 'post')
)
def test_upstreams_rr_unix(self): def test_upstreams_rr_unix(self):
addr_0 = self.testdir + '/sock_0' addr_0 = self.testdir + '/sock_0'
@@ -435,8 +461,8 @@ Connection: close
self.conf( self.conf(
{ {
"*:7080": {"pass": "upstreams/one"}, "*:7080": {"pass": "upstreams/one"},
"unix:" + addr_0: {"pass": "applications/ups_0"}, "unix:" + addr_0: {"pass": "routes/one"},
"unix:" + addr_1: {"pass": "applications/ups_1"}, "unix:" + addr_1: {"pass": "routes/two"},
}, },
'listeners', 'listeners',
), ),
@@ -446,7 +472,7 @@ Connection: close
self.assertIn( self.assertIn(
'success', 'success',
self.conf( self.conf(
{"unix:" + addr_0: {}, "unix:" + addr_1: {},}, {"unix:" + addr_0: {}, "unix:" + addr_1: {}},
'upstreams/one/servers', 'upstreams/one/servers',
), ),
'configure servers unix', 'configure servers unix',
@@ -463,8 +489,8 @@ Connection: close
self.conf( self.conf(
{ {
"*:7080": {"pass": "upstreams/one"}, "*:7080": {"pass": "upstreams/one"},
"[::1]:7081": {"pass": "applications/ups_0"}, "[::1]:7081": {"pass": "routes/one"},
"[::1]:7082": {"pass": "applications/ups_1"}, "[::1]:7082": {"pass": "routes/two"},
}, },
'listeners', 'listeners',
), ),
@@ -474,7 +500,7 @@ Connection: close
self.assertIn( self.assertIn(
'success', 'success',
self.conf( self.conf(
{"[::1]:7081": {}, "[::1]:7082": {},}, 'upstreams/one/servers' {"[::1]:7081": {}, "[::1]:7082": {}}, 'upstreams/one/servers'
), ),
'configure servers ipv6', 'configure servers ipv6',
) )