summaryrefslogtreecommitdiffhomepage
path: root/test/test_routing_tls.py
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2020-10-08 19:19:31 +0300
committerAndrei Belov <defan@nginx.com>2020-10-08 19:19:31 +0300
commitd586ac9fdc4a86c142b06a75dde4cdacad5b52f6 (patch)
tree9817282396f9d2cf5333050e4b5bf807d3617e40 /test/test_routing_tls.py
parent9be35d9b7418c041e5177f273c20f0fd2d3f00ad (diff)
parentad516735a65fe109773b60e26214a071411f1734 (diff)
downloadunit-d586ac9fdc4a86c142b06a75dde4cdacad5b52f6.tar.gz
unit-d586ac9fdc4a86c142b06a75dde4cdacad5b52f6.tar.bz2
Merged with the default branch.1.20.0-1
Diffstat (limited to '')
-rw-r--r--test/test_routing_tls.py48
1 files changed, 17 insertions, 31 deletions
diff --git a/test/test_routing_tls.py b/test/test_routing_tls.py
index a9b8f88d..76cfb485 100644
--- a/test/test_routing_tls.py
+++ b/test/test_routing_tls.py
@@ -7,36 +7,22 @@ class TestRoutingTLS(TestApplicationTLS):
def test_routes_match_scheme_tls(self):
self.certificate()
- self.assertIn(
- 'success',
- self.conf(
- {
- "listeners": {
- "*:7080": {"pass": "routes"},
- "*:7081": {
- "pass": "routes",
- "tls": {"certificate": 'default'},
- },
+ assert 'success' in self.conf(
+ {
+ "listeners": {
+ "*:7080": {"pass": "routes"},
+ "*:7081": {
+ "pass": "routes",
+ "tls": {"certificate": 'default'},
},
- "routes": [
- {
- "match": {"scheme": "http"},
- "action": {"return": 200},
- },
- {
- "match": {"scheme": "https"},
- "action": {"return": 201},
- },
- ],
- "applications": {},
- }
- ),
- 'scheme configure',
- )
+ },
+ "routes": [
+ {"match": {"scheme": "http"}, "action": {"return": 200}},
+ {"match": {"scheme": "https"}, "action": {"return": 201}},
+ ],
+ "applications": {},
+ }
+ ), 'scheme configure'
- self.assertEqual(self.get()['status'], 200, 'http')
- self.assertEqual(self.get_ssl(port=7081)['status'], 201, 'https')
-
-
-if __name__ == '__main__':
- TestRoutingTLS.main()
+ assert self.get()['status'] == 200, 'http'
+ assert self.get_ssl(port=7081)['status'] == 201, 'https'