Skip to content

Commit caa6953

Browse files
committedAug 26, 2016
1,verify error.log in unittest
2,rename unittest case
1 parent f206239 commit caa6953

File tree

9 files changed

+13
-2
lines changed

9 files changed

+13
-2
lines changed
 

‎test/base_case.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def check_ngx_stderr(self, log_str=None, ignore_flag=[]):
3939
if log_str == None:
4040
log_str = self.get_ngx_stderr()
4141

42-
mark = [ '[error]','[lua]','stack traceback','coroutine','in function','aborted','runtime error' ]
42+
mark = [ '[lua]','stack traceback','coroutine','in function','aborted','runtime error' ]
4343
for item in ignore_flag:
4444
mark.remove(item)
4545

File renamed without changes.
File renamed without changes.

‎test/testcase/a_2/case.py ‎test/testcase/a_2_basic_behaviour/case.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ def test_vn_start_with_conf(self):
1717
index_content = f.read(1*1024*1024)
1818
f.close()
1919
assert index_content==r.content
20+
self.check_ngx_stderr()
2021

2122
def test_404(self):
2223
#test notexist.html
2324
r = requests.get('http://127.0.0.1/notexist.html')
2425
assert r.status_code == 404
2526
assert r.headers.get('content-type') == 'text/html'
2627
assert b'404' in r.content
27-
self.check_ngx_stderr(ignore_flag=['[error]'])
28+
self.check_ngx_stderr()
2829

2930
def test_vn_index(self):
3031
r = requests.get('http://127.0.0.1/verynginx/index.html')
@@ -33,6 +34,7 @@ def test_vn_index(self):
3334
index_content = f.read(1*1024*1024)
3435
f.close()
3536
assert index_content==r.content
37+
self.check_ngx_stderr()
3638

3739
def test_vn_index_with_short_url(self):
3840
r = requests.get('http://127.0.0.1/vn/index.html')
@@ -41,4 +43,5 @@ def test_vn_index_with_short_url(self):
4143
index_content = f.read(1*1024*1024)
4244
f.close()
4345
assert index_content==r.content
46+
self.check_ngx_stderr()
4447

File renamed without changes.
File renamed without changes.

‎test/testcase/a_3/case.py ‎test/testcase/a_3_matcher/case.py

+8
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,50 @@ def test_host_equal(self):
1313
assert r.status_code == 400
1414
assert r.headers.get('content-type') == 'text/html'
1515
assert 'hited' in r.text
16+
self.check_ngx_stderr()
1617

1718
r = requests.get('http://b.vntest.com/testhostequal')
1819
assert r.status_code == 404
1920
assert r.headers.get('content-type') == 'text/html'
2021
assert 'hited' not in r.text
22+
self.check_ngx_stderr()
2123

2224
def test_host_not_equal(self):
2325
r = requests.get('http://a.vntest.com/testhostnotequal')
2426
assert r.status_code == 404
2527
assert r.headers.get('content-type') == 'text/html'
2628
assert 'hited' not in r.text
29+
self.check_ngx_stderr()
2730

2831
r = requests.get('http://b.vntest.com/testhostnotequal')
2932
assert r.status_code == 400
3033
assert r.headers.get('content-type') == 'text/html'
3134
assert 'hited' in r.text
35+
self.check_ngx_stderr()
3236

3337
def test_host_match(self):
3438
r = requests.get('http://a.vntest.com/testhostmatch')
3539
assert r.status_code == 400
3640
assert r.headers.get('content-type') == 'text/html'
3741
assert 'hited' in r.text
42+
self.check_ngx_stderr()
3843

3944
r = requests.get('http://127.0.0.1/testhostmatch')
4045
assert r.status_code == 404
4146
assert r.headers.get('content-type') == 'text/html'
4247
assert 'hited' not in r.text
48+
self.check_ngx_stderr()
4349

4450
def test_host_not_match(self):
4551
r = requests.get('http://a.vntest.com/testhostnotmatch')
4652
assert r.status_code == 404
4753
assert r.headers.get('content-type') == 'text/html'
4854
assert 'hited' not in r.text
55+
self.check_ngx_stderr()
4956

5057
r = requests.get('http://127.0.0.1/testhostnotmatch')
5158
assert r.status_code == 400
5259
assert r.headers.get('content-type') == 'text/html'
5360
assert 'hited' in r.text
61+
self.check_ngx_stderr()
5462

File renamed without changes.

0 commit comments

Comments
 (0)