Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
integration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
integration
Commits
ed359a61
Commit
ed359a61
authored
3 years ago
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
fixes for e2ereports script
parent
eaf384ac
No related branches found
No related tags found
2 merge requests
!68
Master merge
,
!11
Release
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
basice2e/e2eReport.py
+15
-5
15 additions, 5 deletions
basice2e/e2eReport.py
with
15 additions
and
5 deletions
basice2e/e2eReport.py
+
15
−
5
View file @
ed359a61
...
@@ -48,17 +48,24 @@ def main():
...
@@ -48,17 +48,24 @@ def main():
else
:
else
:
if
"
Successfully sent to EphID
"
in
line
:
if
"
Successfully sent to EphID
"
in
line
:
# Capture message sending
# Capture message sending
sent_message
=
re
.
findall
(
'
msgDigest: (.{20})\)
'
,
line
)[
0
]
sent_msg
=
re
.
findall
(
'
msgDigest: (.{20})\)
'
,
line
)
if
len
(
sent_msg
)
==
0
:
continue
sent_message
=
sent_msg
[
0
]
log
.
debug
(
"
Located sent message: {}
"
.
format
(
sent_message
))
log
.
debug
(
"
Located sent message: {}
"
.
format
(
sent_message
))
messages_sent
[
sent_message
]
=
{
"
sender
"
:
os
.
path
.
basename
(
path
)}
# Capture message timestamp
# Capture message timestamp
sent_timestamp_str
=
re
.
findall
(
'
INFO (.{19}\.{0,1}\d{0,6})
'
,
line
)[
0
]
sent_ts
=
re
.
findall
(
'
INFO (.{19}\.{0,1}\d{0,6})
'
,
line
)
if
len
(
sent_ts
)
==
0
:
continue
sent_timestamp_str
=
sent_ts
[
0
]
try
:
try
:
sent_timestamp
=
datetime
.
datetime
.
strptime
(
sent_timestamp_str
,
'
%Y/%m/%d %H:%M:%S.%f
'
)
sent_timestamp
=
datetime
.
datetime
.
strptime
(
sent_timestamp_str
,
'
%Y/%m/%d %H:%M:%S.%f
'
)
except
ValueError
:
except
ValueError
:
sent_timestamp
=
datetime
.
datetime
.
strptime
(
sent_timestamp_str
,
'
%Y/%m/%d %H:%M:%S
'
)
sent_timestamp
=
datetime
.
datetime
.
strptime
(
sent_timestamp_str
,
'
%Y/%m/%d %H:%M:%S
'
)
log
.
debug
(
"
Located sent timestamp: {}
"
.
format
(
sent_timestamp
))
log
.
debug
(
"
Located sent timestamp: {}
"
.
format
(
sent_timestamp
))
messages_sent
[
sent_message
]
=
{
"
sender
"
:
os
.
path
.
basename
(
path
)}
messages_sent
[
sent_message
][
"
sent
"
]
=
sent_timestamp
messages_sent
[
sent_message
][
"
sent
"
]
=
sent_timestamp
# Capture rounds messages were sent in
# Capture rounds messages were sent in
...
@@ -72,16 +79,19 @@ def main():
...
@@ -72,16 +79,19 @@ def main():
# Capture message receiving
# Capture message receiving
received_message
=
re
.
findall
(
'
msgDigest: (.{20})
'
,
line
)[
0
]
received_message
=
re
.
findall
(
'
msgDigest: (.{20})
'
,
line
)[
0
]
log
.
debug
(
"
Located received message: {}
"
.
format
(
received_message
))
log
.
debug
(
"
Located received message: {}
"
.
format
(
received_message
))
messages_received
[
received_message
]
=
{
"
receiver
"
:
os
.
path
.
basename
(
path
)}
# Capture message timestamp
# Capture message timestamp
received_timestamp_str
=
re
.
findall
(
'
INFO (.{19}\.{0,1}\d{0,6})
'
,
line
)[
0
]
receive_ts
=
re
.
findall
(
'
INFO (.{19}\.{0,1}\d{0,6})
'
,
line
)
if
len
(
receive_ts
)
==
0
:
continue
received_timestamp_str
=
receive_ts
[
0
]
try
:
try
:
received_timestamp
=
datetime
.
datetime
.
strptime
(
received_timestamp_str
,
received_timestamp
=
datetime
.
datetime
.
strptime
(
received_timestamp_str
,
'
%Y/%m/%d %H:%M:%S.%f
'
)
'
%Y/%m/%d %H:%M:%S.%f
'
)
except
ValueError
:
except
ValueError
:
received_timestamp
=
datetime
.
datetime
.
strptime
(
received_timestamp_str
,
'
%Y/%m/%d %H:%M:%S
'
)
received_timestamp
=
datetime
.
datetime
.
strptime
(
received_timestamp_str
,
'
%Y/%m/%d %H:%M:%S
'
)
log
.
debug
(
"
Located received timestamp: {}
"
.
format
(
received_timestamp
))
log
.
debug
(
"
Located received timestamp: {}
"
.
format
(
received_timestamp
))
messages_received
[
received_message
]
=
{
"
receiver
"
:
os
.
path
.
basename
(
path
)}
messages_received
[
received_message
][
"
received
"
]
=
received_timestamp
messages_received
[
received_message
][
"
received
"
]
=
received_timestamp
elif
"
Round(s)
"
in
line
:
elif
"
Round(s)
"
in
line
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment