projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c8f599
)
3021: Don't worry about env vars, run_test_server.py does that.
author
Tom Clegg <tom@curoverse.com>
Thu, 5 Feb 2015 02:25:53 +0000
(21:25 -0500)
committer
Tom Clegg <tom@curoverse.com>
Thu, 5 Feb 2015 02:25:53 +0000
(21:25 -0500)
apps/workbench/test/test_helper.rb
patch
|
blob
|
history
diff --git
a/apps/workbench/test/test_helper.rb
b/apps/workbench/test/test_helper.rb
index a763b2b74f5da6a190758e4020727b4619f45c06..078190bd32d0a02af56b59df5d28ad1556a511d8 100644
(file)
--- a/
apps/workbench/test/test_helper.rb
+++ b/
apps/workbench/test/test_helper.rb
@@
-122,12
+122,7
@@
class ApiServerForTests
def run_test_server
env_script = nil
Dir.chdir PYTHON_TESTS_DIR do
def run_test_server
env_script = nil
Dir.chdir PYTHON_TESTS_DIR do
- env = {
- 'RAILS_ENV' => 'test',
- 'ARVADOS_WEBSOCKETS' => 'yes'
- }
- cmd = ['python', './run_test_server.py', 'start', '--auth', 'admin']
- env_script = check_call({}.merge(ENV).merge(env), cmd)
+ env_script = check_call %w(python ./run_test_server.py start --auth admin)
end
test_env = {}
env_script.each_line do |line|
end
test_env = {}
env_script.each_line do |line|
@@
-144,7
+139,7
@@
class ApiServerForTests
def stop_test_server
Dir.chdir PYTHON_TESTS_DIR do
# This is a no-op if we're running within run-tests.sh
def stop_test_server
Dir.chdir PYTHON_TESTS_DIR do
# This is a no-op if we're running within run-tests.sh
- check_call
['python', './run_test_server.py', 'stop']
+ check_call
%w(python ./run_test_server.py stop)
end
@@server_is_running = false
end
end
@@server_is_running = false
end