[ARVADOS] updated: 2.1.0-2308-gca1c68a77
Git user
git at public.arvados.org
Fri Apr 15 17:39:55 UTC 2022
Summary of changes:
apps/workbench/app/models/repository.rb | 9 +++++----
apps/workbench/test/integration/repositories_browse_test.rb | 3 ---
build/run-tests.sh | 12 ++++++------
sdk/python/tests/run_test_server.py | 12 ++++++------
4 files changed, 17 insertions(+), 19 deletions(-)
via ca1c68a7718a44c950f7d61e13a4ecf96da899b6 (commit)
via 7efc3ad80d4b78a708d9ba2a0442b41e4889b68c (commit)
via e57b58c8e652d859c8008c9d3ec6873edc231c34 (commit)
from 6fc3e8d44c1bf825f7c3727bab1fef81d2518288 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ca1c68a7718a44c950f7d61e13a4ecf96da899b6
Author: Tom Clegg <tom at curii.com>
Date: Fri Apr 15 13:39:00 2022 -0400
18947: Remove unnecessary/broken (double slash) stub.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/test/integration/repositories_browse_test.rb b/apps/workbench/test/integration/repositories_browse_test.rb
index 1fd9d9008..4795486c5 100644
--- a/apps/workbench/test/integration/repositories_browse_test.rb
+++ b/apps/workbench/test/integration/repositories_browse_test.rb
@@ -18,9 +18,6 @@ class RepositoriesTest < ActionDispatch::IntegrationTest
test "browse using arv-git-http" do
repo = api_fixture('repositories')['foo']
- Repository.any_instance.
- stubs(:http_fetch_url).
- returns "#{Rails.configuration.Services.GitHTTP.ExternalURL.to_s}/#{repo['name']}.git"
commit_sha1 = '1de84a854e2b440dc53bf42f8548afa4c17da332'
visit page_with_token('active', "/repositories/#{repo['uuid']}/commit/#{commit_sha1}")
assert_text "Date: Tue Mar 18 15:55:28 2014 -0400"
commit 7efc3ad80d4b78a708d9ba2a0442b41e4889b68c
Author: Tom Clegg <tom at curii.com>
Date: Fri Apr 15 13:37:09 2022 -0400
18947: Avoid connecting git child to passenger/console stdin.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/app/models/repository.rb b/apps/workbench/app/models/repository.rb
index 8b89d57ee..fd30be946 100644
--- a/apps/workbench/app/models/repository.rb
+++ b/apps/workbench/app/models/repository.rb
@@ -81,7 +81,7 @@ class Repository < ArvadosBase
FileUtils.mkdir_p Rails.configuration.Workbench.RepositoryCache
[['git', 'init', '--bare', workdir],
].each do |cmd|
- system *cmd
+ system(*cmd, in: "/dev/null")
raise GitCommandError.new($?.to_s) unless $?.exitstatus == 0
end
end
@@ -96,14 +96,15 @@ class Repository < ArvadosBase
'http.sslVerify',
Rails.configuration.TLS.Insecure ? 'false' : 'true'],
].each do |cmd|
- system *cmd
+ system(*cmd, in: "/dev/null")
raise GitCommandError.new($?.to_s) unless $?.exitstatus == 0
end
env = {}.
merge(ENV).
- merge('ARVADOS_API_TOKEN' => Thread.current[:arvados_api_token])
+ merge('ARVADOS_API_TOKEN' => Thread.current[:arvados_api_token],
+ 'GIT_TERMINAL_PROMPT' => '0')
cmd = ['git', '--git-dir', @workdir] + gitcmd
- io = IO.popen(env, cmd, err: [:child, :out])
+ io = IO.popen(env, cmd, err: [:child, :out], in: "/dev/null")
output = io.read
io.close
# "If [io] is opened by IO.popen, close sets $?." --ruby 2.2.1 docs
commit e57b58c8e652d859c8008c9d3ec6873edc231c34
Author: Tom Clegg <tom at curii.com>
Date: Fri Apr 15 11:16:12 2022 -0400
18947: Fixup use of "githttpd" vs "githttp" in run_test_server.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 8ae9ade32..d517e7e2c 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -40,7 +40,7 @@ sdk/python_test="--test-suite tests.test_keep_locator"
Restrict Python SDK tests to the given class
apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
Restrict Workbench tests to the given file
-services/githttp_test="-check.vv"
+services/githttpd_test="-check.vv"
Show all log messages, even when tests pass (also works
with services/keepstore_test etc.)
ARVADOS_DEBUG=1
@@ -92,7 +92,7 @@ lib/mount
lib/pam
lib/service
services/api
-services/githttp
+services/githttpd
services/crunchstat
services/dockercleaner
services/fuse
@@ -410,7 +410,7 @@ start_services() {
return 0
fi
. "$VENV3DIR/bin/activate"
- echo 'Starting API, controller, keepproxy, keep-web, githttp, ws, and nginx ssl proxy...'
+ echo 'Starting API, controller, keepproxy, keep-web, githttpd, ws, and nginx ssl proxy...'
if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
mkdir -p "$WORKSPACE/services/api/log"
fi
@@ -438,8 +438,8 @@ start_services() {
&& python3 sdk/python/tests/run_test_server.py start_keep-web \
&& checkpidfile keep-web \
&& checkhealth WebDAV \
- && python3 sdk/python/tests/run_test_server.py start_githttp \
- && checkpidfile githttp \
+ && python3 sdk/python/tests/run_test_server.py start_githttpd \
+ && checkpidfile githttpd \
&& checkhealth GitHTTP \
&& python3 sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
@@ -461,7 +461,7 @@ stop_services() {
. "$VENV3DIR/bin/activate" || return
cd "$WORKSPACE" \
&& python3 sdk/python/tests/run_test_server.py stop_nginx \
- && python3 sdk/python/tests/run_test_server.py stop_githttp \
+ && python3 sdk/python/tests/run_test_server.py stop_githttpd \
&& python3 sdk/python/tests/run_test_server.py stop_ws \
&& python3 sdk/python/tests/run_test_server.py stop_keep-web \
&& python3 sdk/python/tests/run_test_server.py stop_keep_proxy \
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 6935e5b71..836776972 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -581,17 +581,17 @@ def run_arv_git_httpd():
gitport = internal_port_from_config("GitHTTP")
env = os.environ.copy()
env.pop('ARVADOS_API_TOKEN', None)
- logf = open(_logfilename('githttp'), WRITE_MODE)
+ logf = open(_logfilename('githttpd'), WRITE_MODE)
agh = subprocess.Popen(['arvados-server', 'git-httpd'],
env=env, stdin=open('/dev/null'), stdout=logf, stderr=logf)
- with open(_pidfile('githttp'), 'w') as f:
+ with open(_pidfile('githttpd'), 'w') as f:
f.write(str(agh.pid))
_wait_until_port_listens(gitport)
def stop_arv_git_httpd():
if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ:
return
- kill_server_pid(_pidfile('githttp'))
+ kill_server_pid(_pidfile('githttpd'))
def run_keep_web():
if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ:
@@ -942,7 +942,7 @@ if __name__ == "__main__":
'start_keep', 'stop_keep',
'start_keep_proxy', 'stop_keep_proxy',
'start_keep-web', 'stop_keep-web',
- 'start_githttp', 'stop_githttp',
+ 'start_githttpd', 'stop_githttpd',
'start_nginx', 'stop_nginx', 'setup_config',
]
parser = argparse.ArgumentParser()
@@ -987,9 +987,9 @@ if __name__ == "__main__":
run_keep_proxy()
elif args.action == 'stop_keep_proxy':
stop_keep_proxy()
- elif args.action == 'start_githttp':
+ elif args.action == 'start_githttpd':
run_arv_git_httpd()
- elif args.action == 'stop_githttp':
+ elif args.action == 'stop_githttpd':
stop_arv_git_httpd()
elif args.action == 'start_keep-web':
run_keep_web()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list