Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
beat.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
beat
beat.core
Commits
ab7aeda2
Commit
ab7aeda2
authored
Apr 23, 2018
by
André Anjos
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More py3k fixes
parent
5cbaac6a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
7 deletions
+13
-7
beat/core/scripts/worker.py
beat/core/scripts/worker.py
+7
-3
beat/core/test/test_plotter.py
beat/core/test/test_plotter.py
+1
-1
beat/core/test/test_worker.py
beat/core/test/test_worker.py
+3
-3
conda/meta.yaml
conda/meta.yaml
+1
-0
requirements.txt
requirements.txt
+1
-0
No files found.
beat/core/scripts/worker.py
View file @
ab7aeda2
...
...
@@ -317,7 +317,7 @@ def main(user_input=None):
message
=
[
status
,
execution_process
.
job_id
,
content
content
.
encode
(),
]
elif
'error'
in
result
:
logger
.
error
(
result
[
'error'
])
...
...
@@ -327,7 +327,7 @@ def main(user_input=None):
execution_process
.
job_id
,
]
message
+=
result
[
'details'
]
message
+=
[
k
.
encode
()
for
k
in
result
[
'details'
]
]
else
:
logger
.
error
(
result
[
'system_error'
])
...
...
@@ -335,7 +335,7 @@ def main(user_input=None):
message
=
[
WorkerController
.
ERROR
,
execution_process
.
job_id
,
result
[
'system_error'
]
result
[
'system_error'
]
.
encode
(),
]
send_multipart
(
socket
,
message
)
...
...
@@ -390,8 +390,12 @@ def main(user_input=None):
parts
=
[
WorkerController
.
ERROR
,
b"Unknown job: %s"
%
job_id
<<<<<<<
HEAD
]
send_multipart
(
socket
,
parts
)
=======
])
>>>>>>>
More
py3k
fixes
continue
# Kill the processing thread
...
...
beat/core/test/test_plotter.py
View file @
ab7aeda2
...
...
@@ -90,7 +90,7 @@ def test_plot_png():
#with open('test.png', 'wb') as f: f.write(fig)
def
skip
_plot_jpeg
():
def
test
_plot_jpeg
():
# disabled test: matplotlib on 'defaults' is not compiled against libjpeg
fig
=
do_plot
(
'image/jpeg'
)
nose
.
tools
.
eq_
(
imghdr
.
what
(
'test.jpg'
,
fig
),
'jpeg'
)
...
...
beat/core/test/test_worker.py
View file @
ab7aeda2
...
...
@@ -365,7 +365,7 @@ class TestConnection(TestWorkerBase):
self
.
start_worker
(
WORKER1
,
'tcp://127.0.0.1:50999'
)
message
=
controller
.
queue
.
get
()
self
.
assertEqual
(
message
,
'READY
%s'
%
WORKER1
)
self
.
assertEqual
(
message
,
'READY
'
+
WORKER1
.
decode
()
)
controller
.
queue
.
put
(
'STOP'
)
...
...
@@ -378,7 +378,7 @@ class TestConnection(TestWorkerBase):
self
.
assertEqual
(
message
,
'STARTED'
)
message
=
controller
.
queue
.
get
()
self
.
assertEqual
(
message
,
'READY
%s'
%
WORKER1
)
self
.
assertEqual
(
message
,
'READY
'
+
WORKER1
.
decode
()
)
controller
.
queue
.
put
(
'STOP'
)
...
...
@@ -529,7 +529,7 @@ class TestOneWorker(TestWorkerBase):
self
.
assertEqual
(
worker
,
WORKER1
)
self
.
assertEqual
(
status
,
WorkerController
.
ERROR
)
self
.
assertTrue
(
job_id
is
None
)
self
.
assertEqual
(
data
[
0
]
,
b
"Unknown job: 1"
)
self
.
assertEqual
(
data
[
0
]
.
decode
(),
"Unknown job: 1"
)
#----------------------------------------------------------
...
...
conda/meta.yaml
View file @
ab7aeda2
...
...
@@ -36,6 +36,7 @@ requirements:
-
six
-
beat.backend.python
-
matplotlib
-
pillow
test
:
requires
:
...
...
requirements.txt
View file @
ab7aeda2
...
...
@@ -10,3 +10,4 @@ setuptools
simplejson
six
matplotlib
pillow
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