-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This reduces warnings on - celery backend - pytest strict mode - pyproj transform This also hardens test order to some degree. Ideally, we could run tests in a random order, but when that is done, sometimes java doesn't stop and restart as cleanly as it should. Also, stop writing GDAL PAM (aux.xml) files when running tox.
- Loading branch information
Showing
6 changed files
with
22 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,10 +29,12 @@ def unavailableWorker(db): | |
@pytest.fixture(scope='session') | ||
def girderWorkerProcess(): | ||
broker = 'amqp://[email protected]' | ||
backend = 'rpc://[email protected]' | ||
env = os.environ.copy() | ||
env['C_FORCE_ROOT'] = 'true' | ||
proc = subprocess.Popen([ | ||
'celery', '-A', 'girder_worker.app', 'worker', '--broker', broker, '--concurrency=1'], | ||
'celery', '-A', 'girder_worker.app', 'worker', '--broker', broker, | ||
'--result-backend', backend, '--concurrency=1'], | ||
close_fds=True, env=env) | ||
yield True | ||
proc.terminate() | ||
|
@@ -46,8 +48,9 @@ def girderWorker(db, girderWorkerProcess): | |
service must be running. | ||
""" | ||
broker = 'amqp://[email protected]' | ||
backend = 'rpc://[email protected]' | ||
Setting().set(WorkerSettings.BROKER, broker) | ||
Setting().set(WorkerSettings.BACKEND, broker) | ||
Setting().set(WorkerSettings.BACKEND, backend) | ||
yield True | ||
Setting().unset(WorkerSettings.BROKER) | ||
Setting().unset(WorkerSettings.BACKEND) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters