Fanscloud
/
AutoFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

220810

This commit is contained in:
zhaoyafan 2022-08-10 18:32:30 +08:00
parent 6128b5979a
commit e087722ecd
2 changed files with 150 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Runner/API/1.html
View File

@ -229,11 +229,11 @@
series: [{ series: [{
name: '通过', name: '通过',
color: '#64bb64', color: '#64bb64',
data: [5] data: [6]
}, { }, {
name: '失败', name: '失败',
color: '#f16d7e', color: '#f16d7e',
data: [1] data: [0]
}, { }, {
name: '错误', name: '错误',
color: '#fdc68c', color: '#fdc68c',
@ -291,7 +291,7 @@
innerSize: '80%', innerSize: '80%',
name: '比例', name: '比例',
data: [ data: [
['通过', 5], ['失败', 1], ['错误', 0] ['通过', 6], ['失败', 0], ['错误', 0]
] ]
}] }]
}, function(c) { }, function(c) {
@ -438,13 +438,13 @@ function html_escape(s) {
<div id="testinfo" style="max-width: 360px; width: auto; float: left;"> <div id="testinfo" style="max-width: 360px; width: auto; float: left;">
<h1 style="margin: 5px 0px 10px 0px; font-family: Microsoft YaHei;">测试报告</h1> <h1 style="margin: 5px 0px 10px 0px; font-family: Microsoft YaHei;">测试报告</h1>
<p class='attribute'><strong>开始时间 : </strong> 2022-08-09 22:17:02</p> <p class='attribute'><strong>开始时间 : </strong> 2022-08-10 18:32:08</p>
<p class='attribute'><strong>合计耗时 : </strong> 00:00:00</p> <p class='attribute'><strong>合计耗时 : </strong> 00:00:01</p>
<p class='attribute'><strong>测试结果 : </strong> 总共 6，通过 5，失败 1，错误 0，通过率 83.33%</p> <p class='attribute'><strong>测试结果 : </strong> 总共 6，通过 6，失败 0，错误 0，通过率 100.00%</p>
<p class='attribute'><strong>失败用例 : </strong> <a class='showDetail' data-toggle='collapse' href='#failedCaseOl' style='text-decoration: none;'>点击查看</a><ol id='failedCaseOl' class='collapse' style='float: left; font-family: Menlo,Monaco,Consolas,monospace;'><li>main.测试用例.test0006_None</li></ol></p> <p class='attribute'><strong>失败用例 : </strong> 无</p>
<p class='attribute'><strong>错误用例 : </strong> 无</p> <p class='attribute'><strong>错误用例 : </strong> 无</p>
@ -457,9 +457,9 @@ function html_escape(s) {
<div style="width: auto; clear: both;"> <div style="width: auto; clear: both;">
<p id='show_detail_line'> <p id='show_detail_line'>
<a class="btn btn-primary" href='javascript:showCase(0)'>概要 83.33%</a> <a class="btn btn-primary" href='javascript:showCase(0)'>概要 100.00%</a>
<a class="btn btn-success" href='javascript:showCase(2)'>通过 5</a> <a class="btn btn-success" href='javascript:showCase(2)'>通过 6</a>
<a class="btn btn-danger" href='javascript:showCase(1)'>失败 1</a> <a class="btn btn-danger" href='javascript:showCase(1)'>失败 0</a>
<a class="btn btn-warning" href='javascript:showCase(3)'>错误 0</a> <a class="btn btn-warning" href='javascript:showCase(3)'>错误 0</a>
<a class="btn btn-info" href='javascript:showCase(4)'>全部 6</a> <a class="btn btn-info" href='javascript:showCase(4)'>全部 6</a>
</p> </p>
@ -486,14 +486,14 @@ function html_escape(s) {
<td>详细</td> <td>详细</td>
</tr> </tr>
<tr class='failClass warning'> <tr class='passClass warning'>
<td>测试用例</td> <td>测试用例</td>
<td></td> <td></td>
<td class="text-center">6</td> <td class="text-center">6</td>
<td class="text-center">5</td> <td class="text-center">6</td>
<td class="text-center">1</td>
<td class="text-center">0</td> <td class="text-center">0</td>
<td class="text-center">0.732秒</td> <td class="text-center">0</td>
<td class="text-center">1.154秒</td>
<td class="text-center"><a href="javascript:showClassDetail('c1',6)" class="detail" id='c1'>查看全部</a></td> <td class="text-center"><a href="javascript:showClassDetail('c1',6)" class="detail" id='c1'>查看全部</a></td>
</tr> </tr>
@ -513,8 +513,15 @@ function html_escape(s) {
<tr id='pt1_3' class='hiddenRow'> <tr id='pt1_3' class='hiddenRow'>
<td class='passedCase' style="vertical-align: middle"><div class='testcase'>test0003_None</div></td> <td class='passedCase' style="vertical-align: middle"><div class='testcase'>test0003_None</div></td>
<td style="vertical-align: left"></td> <td style="vertical-align: middle"></td>
<td colspan='5' align='center'><button type="button" class="btn btn-xs">通过</button></td> <td colspan='5' align='center'>
<button id='btn_pt1_3' type="button" class="btn btn-xs" data-toggle="collapse" data-target='#div_pt1_3'>通过</button>
<div id='div_pt1_3' class="collapse in">
<pre style="text-align:left;font-size:12px;color:#119611">pt1_3:
{'var8': 'Windows、Linux修改连接数限制'}
</pre>
</div>
</td>
<td class='passedCase' style="vertical-align: middle"></td> <td class='passedCase' style="vertical-align: middle"></td>
</tr> </tr>
@ -532,35 +539,21 @@ function html_escape(s) {
<td class='passedCase' style="vertical-align: middle"></td> <td class='passedCase' style="vertical-align: middle"></td>
</tr> </tr>
<tr id='ft1_6' class='none'> <tr id='pt1_6' class='hiddenRow'>
<td class='failedCase' style="vertical-align: middle"><div class='testcase'>test0006_None</div></td> <td class='passedCase' style="vertical-align: middle"><div class='testcase'>test0006_None</div></td>
<td style="vertical-align: middle"></td> <td style="vertical-align: left"></td>
<td colspan='5' align='center'> <td colspan='5' align='center'><button type="button" class="btn btn-xs">通过</button></td>
<button id='btn_ft1_6' type="button" class="btn btn-xs" data-toggle="collapse" data-target='#div_ft1_6'>失败</button> <td class='passedCase' style="vertical-align: middle"></td>
<div id='div_ft1_6' class="collapse in">
<pre style="text-align:left;font-size:12px;color:#e52000">ft1_6:
Traceback (most recent call last):
File "D:\Project\AutoFramework\Runner\API\DefaultRunner.py", line 507, in foo
return self._test_(index)
File "D:\Project\AutoFramework\Runner\API\DefaultRunner.py", line 492, in test
self.test_unit(data=main_case)
File "D:\Project\AutoFramework\Runner\API\DefaultRunner.py", line 460, in test_unit
_assert(_assert_parm[0], _assert_parm[1])
AssertionError: 'nginx' unexpectedly found in 'Server: nginx\nDate: Tue, 09 Aug 2022 14:17:03 GMT\nContent-Type: application/json\nContent-Length: 208\nLast-Modified: Thu, 04 Aug 2022 07:51:36 GMT\nConnection: keep-alive\nETag: "62eb7a88-d0"\nAccept-Ranges: bytes'
</pre>
</div>
</td>
<td class='failedCase' style="vertical-align: middle"></td>
</tr> </tr>
<tr id='total_row' class="text-center active"> <tr id='total_row' class="text-center active">
<td colspan='2'>总计</td> <td colspan='2'>总计</td>
<td>6</td> <td>6</td>
<td>5</td> <td>6</td>
<td>1</td>
<td>0</td> <td>0</td>
<td>0.732秒</td> <td>0</td>
<td>通过：83.33%</td> <td>1.154秒</td>
<td>通过：100.00%</td>
</tr> </tr>
</table> </table>

32
Runner/API/DefaultRunner.py
View File

@ -169,7 +169,7 @@ class TestCase:
"HTTPAssertBody", "HTTPAssertBody",
"HTTPAssertJson", "HTTPAssertJson",
"DatabaseChannel", "DatabaseChannel",
"DatabaseSqlQuery", "DatabaseSql",
"DatabaseExtract", "DatabaseExtract",
"DatabaseAssertData", "DatabaseAssertData",
"DatabaseAssertCount", "DatabaseAssertCount",
@ -365,19 +365,19 @@ class TestCase:
return str(text) return str(text)
def test_unit(self, data): def test_unit(self, data):
if data['HTTPUri']:
if not data['HTTPChannel']:
raise Exception('channel not set')
http = self.h.where((self.h['Name'] == data['HTTPChannel']), inplace=False).dropna(how='all').reset_index(drop=True, inplace=False).loc[0].to_dict() http = self.h.where((self.h['Name'] == data['HTTPChannel']), inplace=False).dropna(how='all').reset_index(drop=True, inplace=False).loc[0].to_dict()
res_kwargs = { res_kwargs = {
'method': data['HTTPMethod'], 'method': data['HTTPMethod'],
'url': self._sub_variable_auto((http['HostWithScheme'] or '') + (data['HTTPUri'] or '/'), [self._g, self._l]), 'url': self._sub_variable_auto((http['HostWithScheme'] or '') + data['HTTPUri'], [self._g, self._l]),
'query': self._sub_variable_auto(auto_decode(data['HTTPQuery']), [self._g, self._l]), 'query': self._sub_variable_auto(auto_decode(data['HTTPQuery']), [self._g, self._l]),
'data': None, 'data': None,
'json': None, 'json': None,
'file': None, 'file': None,
'header': {}, 'header': {},
'cookie': self._sub_variable_auto( 'cookie': self._sub_variable_auto(auto_decode(data['HTTPCookie']), [self._g, self._l]),
auto_decode(data['HTTPCookie']),
[self._g, self._l]
),
'auth': None, 'auth': None,
'timeout': 15, 'timeout': 15,
'proxy': None, 'proxy': None,
@ -462,7 +462,27 @@ class TestCase:
raise Exception('wrong assertion statement') raise Exception('wrong assertion statement')
if 0 == expect_flag: if 0 == expect_flag:
self.unit.assertEqual(str(actual), expect) self.unit.assertEqual(str(actual), expect)
if data['DatabaseSql']:
if not data['DatabaseChannel']:
raise Exception('channel not set')
base = self.b.where((self.b['Name'] == data['DatabaseChannel']), inplace=False).dropna(how='all').reset_index(drop=True, inplace=False).loc[0].to_dict()
# print(base)
conn = MySQL().connect(
host=base['Host'], port=int(base['Port']),
user=base['User'], password=base['Password'], database=base['Database'], charset=base['Charset'], cursor='Dict'
)
conn.execute(data['DatabaseSql'])
# print(conn.fetchall())
# print(conn.count())
for var_name, var_value in {
'_Data': ReList(conn.fetchall() or [])
}.items():
locals().__setitem__(var_name, var_value)
for k, v in (auto_decode(data['DatabaseExtract']) or {}).items():
d = re.findall('^([0-9A-Za-z_]+).*?', v)[0]
self._g[str(k)] = str(eval('_' + v.replace(d, d.title(), 1)))
print(self._g)
# expect = self._to_string(data['HTTPAssertStatus']) # expect = self._to_string(data['HTTPAssertStatus'])