diff options
author | Max Romanov <max.romanov@nginx.com> | 2018-08-06 17:27:33 +0300 |
---|---|---|
committer | Max Romanov <max.romanov@nginx.com> | 2018-08-06 17:27:33 +0300 |
commit | 1bb22d1e922c87d3c86c67bdce626767ee48fb5c (patch) | |
tree | 6e067a82b309c3a0d0f592f037f26d886a7f8c13 /test | |
parent | b6ce2da65c9c5229d744b2d964623b2d0f731ee9 (diff) | |
download | unit-1bb22d1e922c87d3c86c67bdce626767ee48fb5c.tar.gz unit-1bb22d1e922c87d3c86c67bdce626767ee48fb5c.tar.bz2 |
Unit application library.
Library now used in all language modules.
Old 'nxt_app_*' code removed.
See src/test/nxt_unit_app_test.c for usage sample.
Diffstat (limited to 'test')
-rw-r--r-- | test/python/atexit/wsgi.py | 3 | ||||
-rw-r--r-- | test/python/close/wsgi.py | 3 | ||||
-rw-r--r-- | test/python/close_error/wsgi.py | 3 | ||||
-rw-r--r-- | test/unit.py | 8 |
4 files changed, 13 insertions, 4 deletions
diff --git a/test/python/atexit/wsgi.py b/test/python/atexit/wsgi.py index 561d8049..a5a9918d 100644 --- a/test/python/atexit/wsgi.py +++ b/test/python/atexit/wsgi.py @@ -2,7 +2,8 @@ import atexit def application(environ, start_response): def at_exit(): - environ['wsgi.errors'].write('At exit called.') + environ['wsgi.errors'].write('At exit called.\n') + environ['wsgi.errors'].flush() atexit.register(at_exit) diff --git a/test/python/close/wsgi.py b/test/python/close/wsgi.py index c86a6097..71a5a06c 100644 --- a/test/python/close/wsgi.py +++ b/test/python/close/wsgi.py @@ -8,4 +8,5 @@ class application: yield b'' def close(self): - self.environ['wsgi.errors'].write('Close called.') + self.environ['wsgi.errors'].write('Close called.\n') + self.environ['wsgi.errors'].flush() diff --git a/test/python/close_error/wsgi.py b/test/python/close_error/wsgi.py index 3e9fb63d..dae12c2b 100644 --- a/test/python/close_error/wsgi.py +++ b/test/python/close_error/wsgi.py @@ -8,4 +8,5 @@ class application: yield b'' def close(self): - self.environ['wsgi.errors'].write('Close called.') + self.environ['wsgi.errors'].write('Close called.\n') + self.environ['wsgi.errors'].flush() diff --git a/test/unit.py b/test/unit.py index dfd8f4fc..ae6154aa 100644 --- a/test/unit.py +++ b/test/unit.py @@ -2,6 +2,7 @@ import os import re import sys import json +import mmap import time import shutil import socket @@ -363,9 +364,14 @@ class TestUnitApplicationProto(TestUnitControl): return time.mktime(time.strptime(date, '%a, %d %b %Y %H:%M:%S %Z')) def search_in_log(self, pattern): - with open(self.testdir + '/unit.log', 'r') as f: + with open(self.testdir + '/unit.log', 'r', errors='ignore') as f: return re.search(pattern, f.read()) + def find_in_log(self, pattern): + with open(self.testdir + '/unit.log', 'rb', 0) as f, \ + mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as s: + return s.find(pattern) != -1 + class TestUnitApplicationPython(TestUnitApplicationProto): def load(self, script, name=None): if name is None: |