[ARVADOS] updated: ffb304afad93f50fd6ee43ecda6584dd0ac000c4
Git user
git at public.curoverse.com
Thu May 4 11:16:59 EDT 2017
Summary of changes:
apps/workbench/app/models/container_work_unit.rb | 5 +++-
.../app/views/users/_show_activity.html.erb | 2 +-
apps/workbench/test/unit/work_unit_test.rb | 4 +--
build/run-tests.sh | 2 +-
...nstall-manual-prerequisites.html.textile.liquid | 5 ++--
sdk/cwl/arvados_cwl/arvcontainer.py | 26 ++++++++++++-----
sdk/cwl/tests/test_container.py | 34 +++++++++++++++-------
sdk/go/arvados/container.go | 1 +
sdk/python/tests/test_collections.py | 32 ++++++++++----------
services/api/config/application.rb | 2 ++
.../api/config/initializers/noop_deep_munge.rb | 10 -------
services/api/test/fixtures/containers.yml | 7 +++++
...{noop_deep_munge.rb => noop_deep_munge_test.rb} | 29 ++++++++++--------
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 14 +++++++--
.../crunch-dispatch-slurm_test.go | 15 +++++-----
services/crunch-run/crunchrun.go | 19 ++++++------
services/crunch-run/crunchrun_test.go | 16 ++++++++++
services/nodemanager/arvnodeman/jobqueue.py | 8 ++++-
services/nodemanager/tests/test_jobqueue.py | 2 +-
19 files changed, 148 insertions(+), 85 deletions(-)
delete mode 100644 services/api/config/initializers/noop_deep_munge.rb
rename services/api/test/integration/{noop_deep_munge.rb => noop_deep_munge_test.rb} (63%)
via ffb304afad93f50fd6ee43ecda6584dd0ac000c4 (commit)
via 5ca261ee945cfea279f6df0364c8311e83cebb44 (commit)
via dd0786de66c5decb8581cb092afb405eb390bca9 (commit)
via 8ed7b6dd5d4df93a3f37096afe6d6f81c2a7ef6e (commit)
via f682de562d9c857616f81d48d5cd915748725197 (commit)
via 787e77b30ed6f01ebf3ea74f4212888accf41ecf (commit)
via 8dd7e323798d36e3182c12868c6f1f3dd0eabf96 (commit)
via 3c4b14cf8bbfcea51fefa5d74a0c522547e0bcf4 (commit)
via c64d7e1d5d1879187e1c4002445fab1d3c7951a0 (commit)
via 1885991dd79a75034f7650cccef16ebe3fd71959 (commit)
via 001757381fd370a563599ca70ca9b451a71e9726 (commit)
via 65616466b97a92e382f8e432b14ffc3711b95491 (commit)
via e24a892b920fd8cddf091a3c15acba1ab27f510d (commit)
via fa0ccc4c50e9c141bcd40f12f3047aea3226c0ca (commit)
via 35dde4022e317536642646366ff01578bf904fb6 (commit)
via 3f8f2a9b9d1ccb1e4e696607ef015de0524da519 (commit)
via fe29b56aecc9b5e277dd9a956fb05867827c91c9 (commit)
via 7f9839be2facf7e5bf3106dab0859da5d971f31e (commit)
via 9350a0562776be66a099dce1c3e825b32f5a8907 (commit)
via 974799e09498bc5fa27ba2e269a72f8ae5173793 (commit)
from 607fe087f6167061714a524dd53cbbc21b974973 (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 ffb304afad93f50fd6ee43ecda6584dd0ac000c4
Merge: 5ca261e dd0786d
Author: Tom Clegg <tom at curoverse.com>
Date: Thu May 4 11:16:42 2017 -0400
11308: Merge branch 'master' into 11308-python3
commit 5ca261ee945cfea279f6df0364c8311e83cebb44
Author: Tom Clegg <tom at curoverse.com>
Date: Thu May 4 11:09:41 2017 -0400
11308: Fix bytes vs. strings from recent merge.
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index 24f305a..24fedea 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -1191,18 +1191,18 @@ class NewCollectionTestCaseWithServers(run_test_server.TestCaseWithServers):
def test_flush_after_small_block_packing(self):
c = Collection()
# Write a couple of small files,
- f = c.open("count.txt", "w")
- f.write("0123456789")
+ f = c.open("count.txt", "wb")
+ f.write(b"0123456789")
f.close(flush=False)
- foo = c.open("foo.txt", "w")
- foo.write("foo")
+ foo = c.open("foo.txt", "wb")
+ foo.write(b"foo")
foo.close(flush=False)
self.assertEqual(
c.manifest_text(),
'. a8430a058b8fbf408e1931b794dbd6fb+13 0:10:count.txt 10:3:foo.txt\n')
- f = c.open("count.txt", "r+")
+ f = c.open("count.txt", "rb+")
f.close(flush=True)
self.assertEqual(
@@ -1212,19 +1212,19 @@ class NewCollectionTestCaseWithServers(run_test_server.TestCaseWithServers):
def test_write_after_small_block_packing2(self):
c = Collection()
# Write a couple of small files,
- f = c.open("count.txt", "w")
- f.write("0123456789")
+ f = c.open("count.txt", "wb")
+ f.write(b"0123456789")
f.close(flush=False)
- foo = c.open("foo.txt", "w")
- foo.write("foo")
+ foo = c.open("foo.txt", "wb")
+ foo.write(b"foo")
foo.close(flush=False)
self.assertEqual(
c.manifest_text(),
'. a8430a058b8fbf408e1931b794dbd6fb+13 0:10:count.txt 10:3:foo.txt\n')
- f = c.open("count.txt", "r+")
- f.write("abc")
+ f = c.open("count.txt", "rb+")
+ f.write(b"abc")
f.close(flush=False)
self.assertEqual(
@@ -1234,13 +1234,13 @@ class NewCollectionTestCaseWithServers(run_test_server.TestCaseWithServers):
def test_small_block_packing_with_overwrite(self):
c = Collection()
- c.open("b1", "w").close()
- c["b1"].writeto(0, "b1", 0)
+ c.open("b1", "wb").close()
+ c["b1"].writeto(0, b"b1", 0)
- c.open("b2", "w").close()
- c["b2"].writeto(0, "b2", 0)
+ c.open("b2", "wb").close()
+ c["b2"].writeto(0, b"b2", 0)
- c["b1"].writeto(0, "1b", 0)
+ c["b1"].writeto(0, b"1b", 0)
self.assertEquals(c.manifest_text(), ". ed4f3f67c70b02b29c50ce1ea26666bd+4 0:2:b1 2:2:b2\n")
self.assertEquals(c["b1"].manifest_text(), ". ed4f3f67c70b02b29c50ce1ea26666bd+4 0:2:b1\n")
commit fa0ccc4c50e9c141bcd40f12f3047aea3226c0ca
Author: Tom Clegg <tom at curoverse.com>
Date: Wed May 3 10:20:35 2017 -0400
11308: Stop test suite if api etc. cannot be started.
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 32432f8..87a7264 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -829,7 +829,7 @@ if [ ! -z "$only" ] && [ "$only" == "services/api" ]; then
exit_cleanly
fi
-start_api
+start_api || { stop_services; fatal "start_api"; }
test_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list