Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos.toolbox
Commits
fff8891f
Commit
fff8891f
authored
Oct 21, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: update tests with recent changes
parent
841517de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
158 additions
and
35 deletions
+158
-35
slapos/test/monitor/testbootstrap.py
slapos/test/monitor/testbootstrap.py
+28
-15
slapos/test/monitor/testrunpromise.py
slapos/test/monitor/testrunpromise.py
+130
-20
No files found.
slapos/test/monitor/testbootstrap.py
View file @
fff8891f
...
@@ -13,6 +13,7 @@ class MonitorBootstrapTest(unittest.TestCase):
...
@@ -13,6 +13,7 @@ class MonitorBootstrapTest(unittest.TestCase):
def
setUp
(
self
):
def
setUp
(
self
):
self
.
base_dir
=
tempfile
.
mkdtemp
()
self
.
base_dir
=
tempfile
.
mkdtemp
()
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'promise'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'promise'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'monitor-promise'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'public'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'public'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'private'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'private'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'cron.d'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
base_dir
,
'cron.d'
))
...
@@ -32,6 +33,10 @@ class MonitorBootstrapTest(unittest.TestCase):
...
@@ -32,6 +33,10 @@ class MonitorBootstrapTest(unittest.TestCase):
title
=
"Monitor"
,
title
=
"Monitor"
,
url_list
=
""
,
url_list
=
""
,
base_url
=
"https://monitor.test.com"
,
base_url
=
"https://monitor.test.com"
,
monitor_promise_folder
=
os
.
path
.
join
(
self
.
base_dir
,
'monitor-promise'
),
promise_folder
=
os
.
path
.
join
(
self
.
base_dir
,
'promise'
),
promise_runner_pid
=
os
.
path
.
join
(
self
.
base_dir
,
'run'
,
'monitor-promises.pid'
),
public_folder
=
os
.
path
.
join
(
self
.
base_dir
,
'public'
),
public_path_list
=
""
,
public_path_list
=
""
,
private_path_list
=
""
,
private_path_list
=
""
,
promise_run_script
=
"/bin/echo"
,
promise_run_script
=
"/bin/echo"
,
...
@@ -39,7 +44,9 @@ class MonitorBootstrapTest(unittest.TestCase):
...
@@ -39,7 +44,9 @@ class MonitorBootstrapTest(unittest.TestCase):
)
)
self
.
monitor_conf
=
"""[monitor]
self
.
monitor_conf
=
"""[monitor]
parameter-file-path = %(base_dir)s/knowledge0.cfg
parameter-file-path = %(base_dir)s/knowledge0.cfg
promise-folder-list = %(base_dir)s/promise
promise-folder = %(base_dir)s/promise
service-pid-folder = %(base_dir)s/run
monitor-promise-folder = %(base_dir)s/monitor-promise
private-folder = %(base_dir)s/private
private-folder = %(base_dir)s/private
public-folder = %(base_dir)s/public
public-folder = %(base_dir)s/public
public-path-list = %(public_path_list)s
public-path-list = %(public_path_list)s
...
@@ -48,6 +55,7 @@ crond-folder = %(base_dir)s/cron.d
...
@@ -48,6 +55,7 @@ crond-folder = %(base_dir)s/cron.d
logrotate-folder = %(base_dir)s/logrotate.d
logrotate-folder = %(base_dir)s/logrotate.d
report-folder = %(base_dir)s/monitor-report
report-folder = %(base_dir)s/monitor-report
root-title = %(root_title)s
root-title = %(root_title)s
pid-file = %(base_dir)s/monitor.pid
parameter-list =
parameter-list =
raw monitor-user admin
raw monitor-user admin
file sample %(base_dir)s/param
file sample %(base_dir)s/param
...
@@ -105,15 +113,20 @@ promise-runner = %(promise_run_script)s
...
@@ -105,15 +113,20 @@ promise-runner = %(promise_run_script)s
base_url
=
url
)
base_url
=
url
)
self
.
assertTrue
(
opml_outline
in
opml_content
)
self
.
assertTrue
(
opml_outline
in
opml_content
)
def
check_promises
(
self
):
def
check_promises
(
self
,
sequential
=
False
):
promise_entry
=
'* * * * * %(promise_run_script)s --pid_path "%(promise_pid)s" --output "%(promise_output)s" --promise_script "%(promise_executable)s" --promise_name "%(promise_name)s" --monitor_url "%(base_url)s/share/jio_private/" --history_folder "%(base_dir)s/public" --instance_name "%(title)s" --hosting_name "%(root_title)s"'
promise_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'promise'
)
promise_cron
=
os
.
path
.
join
(
self
.
base_dir
,
'cron.d'
,
'monitor-promises'
)
promise_cron
=
os
.
path
.
join
(
self
.
base_dir
,
'cron.d'
,
'monitor-promises'
)
self
.
assertTrue
(
os
.
path
.
exists
(
promise_cron
))
self
.
assertTrue
(
os
.
path
.
exists
(
promise_cron
))
with
open
(
promise_cron
)
as
cronf
:
with
open
(
promise_cron
)
as
cronf
:
promise_command_list
=
cronf
.
read
()
promise_command_list
=
cronf
.
read
()
if
not
sequential
:
promise_entry
=
'* * * * * sleep $((1 + RANDOM %% 30)) && %(promise_run_script)s --pid_path "%(promise_runner_pid)s" --output "%(public_folder)s" --promise_folder "%(promise_folder)s" --monitor_promise_folder "%(monitor_promise_folder)s" --monitor_url "%(base_url)s/share/jio_private/" --history_folder "%(base_dir)s/public" --instance_name "%(title)s" --hosting_name "%(root_title)s"'
entry_line
=
promise_entry
%
self
.
monitor_config_dict
self
.
assertTrue
(
entry_line
in
promise_command_list
)
else
:
promise_entry
=
'* * * * * sleep $((1 + RANDOM %% 30)) &&%(promise_run_script)s --pid_path "%(promise_pid)s" --output "%(promise_output)s" --promise_script "%(promise_executable)s" --promise_name "%(promise_name)s" --monitor_url "%(base_url)s/share/jio_private/" --history_folder "%(base_dir)s/public" --instance_name "%(title)s" --hosting_name "%(root_title)s"'
promise_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'promise'
)
for
filename
in
os
.
listdir
(
promise_dir
):
for
filename
in
os
.
listdir
(
promise_dir
):
promise_dict
=
dict
(
promise_dict
=
dict
(
promise_pid
=
os
.
path
.
join
(
self
.
base_dir
,
'run'
,
'%s.pid'
%
filename
),
promise_pid
=
os
.
path
.
join
(
self
.
base_dir
,
'run'
,
'%s.pid'
%
filename
),
...
...
slapos/test/monitor/testrunpromise.py
View file @
fff8891f
...
@@ -6,13 +6,14 @@ import tempfile
...
@@ -6,13 +6,14 @@ import tempfile
import
unittest
import
unittest
import
json
import
json
from
datetime
import
datetime
from
datetime
import
datetime
from
slapos.monitor.runpromise
import
*
from
slapos.monitor.runpromise
import
RunPromise
,
parseArguments
class
MonitorPromiseTest
(
unittest
.
TestCase
):
class
MonitorPromiseTest
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
self
.
base_dir
=
tempfile
.
mkdtemp
()
self
.
base_dir
=
tempfile
.
mkdtemp
()
self
.
promise_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'promise'
)
self
.
promise_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'promise'
)
self
.
monitor_promise_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'monitor-promise'
)
self
.
report_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'report'
)
self
.
report_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'report'
)
self
.
public_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'public'
)
self
.
public_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'public'
)
self
.
private_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'private'
)
self
.
private_dir
=
os
.
path
.
join
(
self
.
base_dir
,
'private'
)
...
@@ -22,19 +23,22 @@ class MonitorPromiseTest(unittest.TestCase):
...
@@ -22,19 +23,22 @@ class MonitorPromiseTest(unittest.TestCase):
os
.
mkdir
(
self
.
private_dir
)
os
.
mkdir
(
self
.
private_dir
)
os
.
mkdir
(
self
.
report_dir
)
os
.
mkdir
(
self
.
report_dir
)
os
.
mkdir
(
self
.
run_dir
)
os
.
mkdir
(
self
.
run_dir
)
os
.
mkdir
(
self
.
monitor_promise_dir
)
def
tearDown
(
self
):
def
tearDown
(
self
):
if
os
.
path
.
exists
(
self
.
base_dir
):
if
os
.
path
.
exists
(
self
.
base_dir
):
shutil
.
rmtree
(
self
.
base_dir
)
shutil
.
rmtree
(
self
.
base_dir
)
def
writePromiseOK
(
self
,
name
):
def
writePromiseOK
(
self
,
name
,
monitor_folder
=
False
):
content
=
"""#!/bin/sh
content
=
"""#!/bin/sh
echo "success"
echo "success"
exit 0
exit 0
"""
"""
promise_path
=
os
.
path
.
join
(
self
.
promise_dir
,
name
)
promise_path
=
os
.
path
.
join
(
self
.
promise_dir
,
name
)
if
monitor_folder
:
promise_path
=
os
.
path
.
join
(
self
.
monitor_promise_dir
,
name
)
self
.
writeContent
(
promise_path
,
content
)
self
.
writeContent
(
promise_path
,
content
)
os
.
chmod
(
promise_path
,
0755
)
os
.
chmod
(
promise_path
,
0755
)
return
promise_path
return
promise_path
...
@@ -54,7 +58,7 @@ exit 2
...
@@ -54,7 +58,7 @@ exit 2
with
open
(
file_path
,
'w'
)
as
cfg
:
with
open
(
file_path
,
'w'
)
as
cfg
:
cfg
.
write
(
config
)
cfg
.
write
(
config
)
def
getPromiseParser
(
self
,
name
,
promise_path
,
promise_type
):
def
get
Unique
PromiseParser
(
self
,
name
,
promise_path
,
promise_type
):
pid_path
=
os
.
path
.
join
(
self
.
run_dir
,
'%s.pid'
%
name
)
pid_path
=
os
.
path
.
join
(
self
.
run_dir
,
'%s.pid'
%
name
)
if
promise_type
==
"report"
:
if
promise_type
==
"report"
:
output_path
=
os
.
path
.
join
(
self
.
private_dir
,
'%s.report.json'
%
name
)
output_path
=
os
.
path
.
join
(
self
.
private_dir
,
'%s.report.json'
%
name
)
...
@@ -71,11 +75,113 @@ exit 2
...
@@ -71,11 +75,113 @@ exit 2
arg_parser
=
parseArguments
()
arg_parser
=
parseArguments
()
return
arg_parser
.
parse_args
(
promise_cmd
)
return
arg_parser
.
parse_args
(
promise_cmd
)
def
getPromiseParser
(
self
):
pid_path
=
os
.
path
.
join
(
self
.
run_dir
,
'monitor-promise.pid'
)
promise_cmd
=
[
'--pid_path'
,
'%s'
%
pid_path
,
'--output'
,
self
.
public_dir
,
'--promise_folder'
,
self
.
promise_dir
,
'--monitor_promise_folder'
,
self
.
monitor_promise_dir
,
'--promise_type'
,
'status'
,
'--monitor_url'
,
'https://monitor.test.com/share/jio_private/'
,
'--history_folder'
,
self
.
public_dir
,
'--instance_name'
,
'Monitor'
,
'--hosting_name'
,
'Monitor ROOT'
]
arg_parser
=
parseArguments
()
return
arg_parser
.
parse_args
(
promise_cmd
)
def
test_promise_OK
(
self
):
def
test_promise_OK
(
self
):
promise
=
self
.
writePromiseOK
(
'promise_1'
)
promise
=
self
.
writePromiseOK
(
'promise_1'
)
parser
=
self
.
getPromiseParser
(
'promise_1'
,
promise
,
'status'
)
parser
=
self
.
getPromiseParser
()
runpromise
(
parser
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
result1
=
json
.
loads
(
open
(
result_file
).
read
())
change_time
=
result1
.
pop
(
'change-time'
,
0
)
change_date
=
datetime
.
fromtimestamp
(
change_time
)
start_date
=
result1
.
pop
(
'start-date'
)
expected_result
=
{
'status'
:
'OK'
,
'hosting_subscription'
:
'Monitor ROOT'
,
'title'
:
u'promise_1'
,
'instance'
:
'Monitor'
,
'_links'
:
{
'monitor'
:
{
'href'
:
'https://monitor.test.com/share/jio_private/'
}},
'message'
:
'success
\
n
'
,
'type'
:
'status'
}
self
.
assertEquals
(
expected_result
,
result1
)
# second run
time
.
sleep
(
1
)
promise_runner
.
runpromise
()
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
start_date2
=
result2
.
pop
(
'start-date'
)
change_date2
=
datetime
.
fromtimestamp
(
change_time2
)
self
.
assertEquals
(
expected_result
,
result2
)
self
.
assertEquals
(
change_date
.
strftime
(
'%Y-%m-%d %H:%M:%S'
),
change_date2
.
strftime
(
'%Y-%m-%d %H:%M:%S'
))
history_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.history.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
history_file
))
history
=
json
.
load
(
open
(
history_file
))
self
.
assertTrue
(
history
[
'date'
]
>
change_time
)
self
.
assertTrue
(
len
(
history
[
'data'
])
==
2
)
result1
[
'change-time'
]
=
change_time
result1
[
'start-date'
]
=
start_date
result1
.
pop
(
'_links'
)
result2
[
'start-date'
]
=
start_date2
result2
[
'change-time'
]
=
change_time2
# not in history
result2
.
pop
(
'_links'
)
result2
.
pop
(
'hosting_subscription'
)
result2
.
pop
(
'title'
)
result2
.
pop
(
'instance'
)
result2
.
pop
(
'type'
)
self
.
assertEquals
(
history
[
'data'
][
0
],
result1
)
self
.
assertEquals
(
history
[
'data'
][
1
],
result2
)
def
test_promise_two_folder
(
self
):
promise
=
self
.
writePromiseOK
(
'promise_1'
)
promise2
=
self
.
writePromiseOK
(
'promise_2'
,
monitor_folder
=
True
)
parser
=
self
.
getPromiseParser
()
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
result2_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_2.status.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result2_file
))
result1
=
json
.
loads
(
open
(
result_file
).
read
())
result1
.
pop
(
'change-time'
)
result1
.
pop
(
'start-date'
)
expected_result
=
{
'status'
:
'OK'
,
'hosting_subscription'
:
'Monitor ROOT'
,
'title'
:
u'promise_1'
,
'instance'
:
'Monitor'
,
'_links'
:
{
'monitor'
:
{
'href'
:
'https://monitor.test.com/share/jio_private/'
}},
'message'
:
'success
\
n
'
,
'type'
:
'status'
}
self
.
assertEquals
(
expected_result
,
result1
)
result2
=
json
.
loads
(
open
(
result2_file
).
read
())
result2
.
pop
(
'change-time'
)
result2
.
pop
(
'start-date'
)
expected_result
=
{
'status'
:
'OK'
,
'hosting_subscription'
:
'Monitor ROOT'
,
'title'
:
u'promise_2'
,
'instance'
:
'Monitor'
,
'_links'
:
{
'monitor'
:
{
'href'
:
'https://monitor.test.com/share/jio_private/'
}},
'message'
:
'success
\
n
'
,
'type'
:
'status'
}
self
.
assertEquals
(
expected_result
,
result2
)
def
test_promise_One_By_One
(
self
):
promise
=
self
.
writePromiseOK
(
'promise_1'
)
parser
=
self
.
getUniquePromiseParser
(
'promise_1'
,
promise
,
'status'
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
...
@@ -92,7 +198,7 @@ exit 2
...
@@ -92,7 +198,7 @@ exit 2
self
.
assertEquals
(
expected_result
,
result1
)
self
.
assertEquals
(
expected_result
,
result1
)
# second run
# second run
runpromise
(
parser
)
promise_runner
.
runpromise
(
)
result2
=
json
.
loads
(
open
(
result_file
).
read
())
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
...
@@ -115,8 +221,9 @@ exit 2
...
@@ -115,8 +221,9 @@ exit 2
def
test_promise_NOK
(
self
):
def
test_promise_NOK
(
self
):
promise
=
self
.
writePromiseNOK
(
'promise_1'
)
promise
=
self
.
writePromiseNOK
(
'promise_1'
)
parser
=
self
.
getPromiseParser
(
'promise_1'
,
promise
,
'status'
)
parser
=
self
.
getPromiseParser
()
runpromise
(
parser
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
...
@@ -133,7 +240,7 @@ exit 2
...
@@ -133,7 +240,7 @@ exit 2
self
.
assertEquals
(
expected_result
,
result1
)
self
.
assertEquals
(
expected_result
,
result1
)
# second run
# second run
runpromise
(
parser
)
promise_runner
.
runpromise
(
)
result2
=
json
.
loads
(
open
(
result_file
).
read
())
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
...
@@ -145,8 +252,9 @@ exit 2
...
@@ -145,8 +252,9 @@ exit 2
def
test_promise_mixed
(
self
):
def
test_promise_mixed
(
self
):
promise
=
self
.
writePromiseOK
(
'promise_1'
)
promise
=
self
.
writePromiseOK
(
'promise_1'
)
parser
=
self
.
getPromiseParser
(
'promise_1'
,
promise
,
'status'
)
parser
=
self
.
getPromiseParser
()
runpromise
(
parser
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
result_file
=
os
.
path
.
join
(
self
.
public_dir
,
'promise_1.status.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
...
@@ -165,10 +273,10 @@ exit 2
...
@@ -165,10 +273,10 @@ exit 2
# second run with failure
# second run with failure
time
.
sleep
(
2
)
time
.
sleep
(
2
)
promise
=
self
.
writePromiseNOK
(
'promise_1'
)
promise
=
self
.
writePromiseNOK
(
'promise_1'
)
parser
=
self
.
getPromiseParser
(
'promise_1'
,
promise
,
'status'
)
parser
=
self
.
getPromiseParser
()
expected_result
[
'message'
]
=
'failed
\
n
'
expected_result
[
'message'
]
=
'failed
\
n
'
expected_result
[
'status'
]
=
'ERROR'
expected_result
[
'status'
]
=
'ERROR'
runpromise
(
parser
)
promise_runner
.
runpromise
(
)
result2
=
json
.
loads
(
open
(
result_file
).
read
())
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
)
change_time2
=
result2
.
pop
(
'change-time'
)
...
@@ -181,8 +289,9 @@ exit 2
...
@@ -181,8 +289,9 @@ exit 2
def
test_report_OK
(
self
):
def
test_report_OK
(
self
):
promise
=
self
.
writePromiseOK
(
'sample_report'
)
promise
=
self
.
writePromiseOK
(
'sample_report'
)
parser
=
self
.
getPromiseParser
(
'sample_report'
,
promise
,
'report'
)
parser
=
self
.
getUniquePromiseParser
(
'sample_report'
,
promise
,
'report'
)
runpromise
(
parser
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
private_dir
,
'sample_report.report.json'
)
result_file
=
os
.
path
.
join
(
self
.
private_dir
,
'sample_report.report.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
...
@@ -199,7 +308,7 @@ exit 2
...
@@ -199,7 +308,7 @@ exit 2
self
.
assertEquals
(
expected_result
,
result1
)
self
.
assertEquals
(
expected_result
,
result1
)
# second run
# second run
runpromise
(
parser
)
promise_runner
.
runpromise
(
)
result2
=
json
.
loads
(
open
(
result_file
).
read
())
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
change_time2
=
result2
.
pop
(
'change-time'
,
0
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
result2
.
pop
(
'start-date'
,
'2016-08-05 00:00:00'
)
...
@@ -221,8 +330,9 @@ exit 2
...
@@ -221,8 +330,9 @@ exit 2
def
test_report_mixed
(
self
):
def
test_report_mixed
(
self
):
promise
=
self
.
writePromiseOK
(
'sample_report'
)
promise
=
self
.
writePromiseOK
(
'sample_report'
)
parser
=
self
.
getPromiseParser
(
'sample_report'
,
promise
,
'report'
)
parser
=
self
.
getUniquePromiseParser
(
'sample_report'
,
promise
,
'report'
)
runpromise
(
parser
)
promise_runner
=
RunPromise
(
parser
)
promise_runner
.
runpromise
()
result_file
=
os
.
path
.
join
(
self
.
private_dir
,
'sample_report.report.json'
)
result_file
=
os
.
path
.
join
(
self
.
private_dir
,
'sample_report.report.json'
)
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
self
.
assertTrue
(
os
.
path
.
exists
(
result_file
))
...
@@ -241,10 +351,10 @@ exit 2
...
@@ -241,10 +351,10 @@ exit 2
# second run with failure
# second run with failure
time
.
sleep
(
2
)
time
.
sleep
(
2
)
promise
=
self
.
writePromiseNOK
(
'sample_report'
)
promise
=
self
.
writePromiseNOK
(
'sample_report'
)
parser
=
self
.
getPromiseParser
(
'sample_report'
,
promise
,
'report'
)
parser
=
self
.
get
Unique
PromiseParser
(
'sample_report'
,
promise
,
'report'
)
expected_result
[
'message'
]
=
'failed
\
n
'
expected_result
[
'message'
]
=
'failed
\
n
'
expected_result
[
'status'
]
=
'ERROR'
expected_result
[
'status'
]
=
'ERROR'
runpromise
(
parser
)
promise_runner
.
runpromise
(
)
result2
=
json
.
loads
(
open
(
result_file
).
read
())
result2
=
json
.
loads
(
open
(
result_file
).
read
())
change_time2
=
result2
.
pop
(
'change-time'
)
change_time2
=
result2
.
pop
(
'change-time'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment