Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flamenco-worker-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
flamenco-worker-python
Commits
f9c85d8b
Commit
f9c85d8b
authored
Jan 19, 2017
by
Sybren A. Stüvel
Browse files
Options
Downloads
Patches
Plain Diff
Worker: set nickname to hostname upon registration
parent
9f91ee3f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/flamenco-worker-python/flamenco_worker/worker.py
+3
-0
3 additions, 0 deletions
packages/flamenco-worker-python/flamenco_worker/worker.py
packages/flamenco-worker-python/tests/test_worker.py
+8
-2
8 additions, 2 deletions
packages/flamenco-worker-python/tests/test_worker.py
with
11 additions
and
2 deletions
packages/flamenco-worker-python/flamenco_worker/worker.py
+
3
−
0
View file @
f9c85d8b
...
@@ -110,11 +110,13 @@ class FlamencoWorker:
...
@@ -110,11 +110,13 @@ class FlamencoWorker:
async
def
register_at_manager
(
self
,
*
,
may_retry_loop
:
bool
):
async
def
register_at_manager
(
self
,
*
,
may_retry_loop
:
bool
):
import
requests
import
requests
import
socket
self
.
_log
.
info
(
'
Registering at manager
'
)
self
.
_log
.
info
(
'
Registering at manager
'
)
self
.
worker_secret
=
generate_secret
()
self
.
worker_secret
=
generate_secret
()
platform
=
detect_platform
()
platform
=
detect_platform
()
hostname
=
socket
.
gethostname
()
while
True
:
while
True
:
try
:
try
:
...
@@ -124,6 +126,7 @@ class FlamencoWorker:
...
@@ -124,6 +126,7 @@ class FlamencoWorker:
'
secret
'
:
self
.
worker_secret
,
'
secret
'
:
self
.
worker_secret
,
'
platform
'
:
platform
,
'
platform
'
:
platform
,
'
supported_job_types
'
:
self
.
job_types
,
'
supported_job_types
'
:
self
.
job_types
,
'
nickname
'
:
hostname
,
},
},
auth
=
None
,
# explicitly do not use authentication
auth
=
None
,
# explicitly do not use authentication
loop
=
self
.
loop
,
loop
=
self
.
loop
,
...
...
This diff is collapsed.
Click to expand it.
packages/flamenco-worker-python/tests/test_worker.py
+
8
−
2
View file @
f9c85d8b
...
@@ -61,12 +61,14 @@ class WorkerStartupTest(AbstractFWorkerTest):
...
@@ -61,12 +61,14 @@ class WorkerStartupTest(AbstractFWorkerTest):
self
.
manager
.
post
.
assert_not_called
()
self
.
manager
.
post
.
assert_not_called
()
self
.
tuqueue
.
queue
.
assert_not_called
()
self
.
tuqueue
.
queue
.
assert_not_called
()
@unittest.mock.patch
(
'
socket.gethostname
'
)
@unittest.mock.patch
(
'
flamenco_worker.config.merge_with_home_config
'
)
@unittest.mock.patch
(
'
flamenco_worker.config.merge_with_home_config
'
)
def
test_startup_registration
(
self
,
mock_merge_with_home_config
):
def
test_startup_registration
(
self
,
mock_merge_with_home_config
,
mock_gethostname
):
from
flamenco_worker.worker
import
detect_platform
from
flamenco_worker.worker
import
detect_platform
from
mock_responses
import
JsonResponse
,
CoroMock
from
mock_responses
import
JsonResponse
,
CoroMock
self
.
worker
.
worker_id
=
None
self
.
worker
.
worker_id
=
None
mock_gethostname
.
return_value
=
'
ws-unittest
'
self
.
manager
.
post
=
CoroMock
(
return_value
=
JsonResponse
({
self
.
manager
.
post
=
CoroMock
(
return_value
=
JsonResponse
({
'
_id
'
:
'
5555
'
,
'
_id
'
:
'
5555
'
,
...
@@ -85,19 +87,22 @@ class WorkerStartupTest(AbstractFWorkerTest):
...
@@ -85,19 +87,22 @@ class WorkerStartupTest(AbstractFWorkerTest):
'
platform
'
:
detect_platform
(),
'
platform
'
:
detect_platform
(),
'
supported_job_types
'
:
[
'
sleep
'
,
'
unittest
'
],
'
supported_job_types
'
:
[
'
sleep
'
,
'
unittest
'
],
'
secret
'
:
self
.
worker
.
worker_secret
,
'
secret
'
:
self
.
worker
.
worker_secret
,
'
nickname
'
:
'
ws-unittest
'
,
},
},
auth
=
None
,
auth
=
None
,
loop
=
self
.
asyncio_loop
,
loop
=
self
.
asyncio_loop
,
)
)
@unittest.mock.patch
(
'
socket.gethostname
'
)
@unittest.mock.patch
(
'
flamenco_worker.config.merge_with_home_config
'
)
@unittest.mock.patch
(
'
flamenco_worker.config.merge_with_home_config
'
)
def
test_startup_registration_unhappy
(
self
,
mock_merge_with_home_config
):
def
test_startup_registration_unhappy
(
self
,
mock_merge_with_home_config
,
mock_gethostname
):
"""
Test that startup is aborted when the worker can
'
t register.
"""
"""
Test that startup is aborted when the worker can
'
t register.
"""
from
flamenco_worker.worker
import
detect_platform
,
UnableToRegisterError
from
flamenco_worker.worker
import
detect_platform
,
UnableToRegisterError
from
mock_responses
import
JsonResponse
,
CoroMock
from
mock_responses
import
JsonResponse
,
CoroMock
self
.
worker
.
worker_id
=
None
self
.
worker
.
worker_id
=
None
mock_gethostname
.
return_value
=
'
ws-unittest
'
self
.
manager
.
post
=
CoroMock
(
return_value
=
JsonResponse
({
self
.
manager
.
post
=
CoroMock
(
return_value
=
JsonResponse
({
'
_id
'
:
'
5555
'
,
'
_id
'
:
'
5555
'
,
...
@@ -116,6 +121,7 @@ class WorkerStartupTest(AbstractFWorkerTest):
...
@@ -116,6 +121,7 @@ class WorkerStartupTest(AbstractFWorkerTest):
'
platform
'
:
detect_platform
(),
'
platform
'
:
detect_platform
(),
'
supported_job_types
'
:
[
'
sleep
'
,
'
unittest
'
],
'
supported_job_types
'
:
[
'
sleep
'
,
'
unittest
'
],
'
secret
'
:
self
.
worker
.
worker_secret
,
'
secret
'
:
self
.
worker
.
worker_secret
,
'
nickname
'
:
'
ws-unittest
'
,
},
},
auth
=
None
,
auth
=
None
,
loop
=
self
.
asyncio_loop
,
loop
=
self
.
asyncio_loop
,
...
...
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