[ARVADOS] updated: da8714892b6dc603737395547cbcc13fe91c2ee5
Git user
git at public.curoverse.com
Wed Mar 9 15:23:03 EST 2016
Summary of changes:
build/run-tests.sh | 13 +++++++++++--
sdk/ruby/arvados.gemspec | 3 ++-
services/arv-git-httpd/gitolite_test.go | 7 ++++++-
services/fuse/arvados_fuse/__init__.py | 6 +++---
services/fuse/tests/test_mount.py | 12 ++++++++++--
5 files changed, 32 insertions(+), 9 deletions(-)
via da8714892b6dc603737395547cbcc13fe91c2ee5 (commit)
via 583e436f2ea18503467a277ec7254f4618b1123c (commit)
via dfcac6d391c0c94066efea7f395e529106c604c7 (commit)
via 37e13f3cdd4f74777b7f87f55f20fca949af3482 (commit)
via 76624e2dfb931459a7251643d59665d1c7d4ce4d (commit)
from 95a519e20d1900f6f60a66b2e34afa08de1dd335 (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 da8714892b6dc603737395547cbcc13fe91c2ee5
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Mar 9 13:50:41 2016 -0500
8345: Fix dirent timestamps.
diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index f8a902d..f1853d2 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -433,9 +433,9 @@ class Operations(llfuse.Operations):
entry.st_blksize = 512
entry.st_blocks = (entry.st_size/512)+1
- entry.st_atime_ns = int(e.atime())
- entry.st_mtime_ns = int(e.mtime())
- entry.st_ctime_ns = int(e.mtime())
+ entry.st_atime_ns = int(e.atime() * 1000000000)
+ entry.st_mtime_ns = int(e.mtime() * 1000000000)
+ entry.st_ctime_ns = int(e.mtime() * 1000000000)
return entry
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 300e636..1a16e74 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -240,14 +240,22 @@ class FuseSharedTest(MountTestBase):
# check mtime on template
st = os.stat(pipeline_template_path)
- self.assertEqual(st.st_mtime_ns, 1397493304)
+ try:
+ mtime = st.st_mtime_ns / 1000000000
+ except AttributeError:
+ mtime = st.st_mtime
+ self.assertEqual(mtime, 1397493304)
# check mtime on collection
st = os.stat(os.path.join(
self.mounttmp,
'FUSE User',
'collection #1 owned by FUSE'))
- self.assertEqual(st.st_mtime_ns, 1391448174)
+ try:
+ mtime = st.st_mtime_ns / 1000000000
+ except AttributeError:
+ mtime = st.st_mtime
+ self.assertEqual(mtime, 1391448174)
class FuseHomeTest(MountTestBase):
commit 583e436f2ea18503467a277ec7254f4618b1123c
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Mar 9 13:42:39 2016 -0500
Remove duplicate environment variable.
Fixes tests failing after perl security fix.
"Previously on a duplicate, %ENV would have the last entry for the name
from environ[], but a typical getenv() would return the first entry."
refs:
* http://perl5.git.perl.org/perl.git/commitdiff/ae37b791a73a9e78dedb89fb2429d2628cf58076
* https://security-tracker.debian.org/tracker/CVE-2016-2381
No issue #
diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index aa71026..c5bc722 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -26,7 +26,12 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
c.Log(prog, " ", args)
cmd := exec.Command(prog, args...)
cmd.Dir = s.gitoliteHome
- cmd.Env = append(os.Environ(), "HOME=" + s.gitoliteHome)
+ cmd.Env = []string{"HOME=" + s.gitoliteHome}
+ for _, e := range os.Environ() {
+ if !strings.HasPrefix(e, "HOME=") {
+ cmd.Env = append(cmd.Env, e)
+ }
+ }
diags, err := cmd.CombinedOutput()
c.Log(string(diags))
c.Assert(err, check.Equals, nil)
commit dfcac6d391c0c94066efea7f395e529106c604c7
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Mar 9 13:37:48 2016 -0500
8491: Prohibit activesupport 5.0.0 so our gem can be installed with ruby <2.2.2
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 3adcf4d..ffbd0ec 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
"README", "LICENSE-2.0.txt"]
s.required_ruby_version = '>= 2.1.0'
s.add_dependency('google-api-client', '~> 0.6.3', '>= 0.6.3')
- s.add_dependency('activesupport', '>= 3.2.13')
+ # activesupport <5 only because https://dev.arvados.org/issues/8222
+ s.add_dependency('activesupport', '>= 3.2.13', '< 5.0.0')
s.add_dependency('json', '~> 1.7', '>= 1.7.7')
s.add_dependency('andand', '~> 1.3', '>= 1.3.3')
s.add_runtime_dependency('jwt', '>= 0.1.5', '< 1.0.0')
commit 37e13f3cdd4f74777b7f87f55f20fca949af3482
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Mar 9 13:36:49 2016 -0500
8491: Remove git-commit.version before running api server tests
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 38ac98a..1e67ea0 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -772,6 +772,7 @@ do_test doc doclinkchecker
stop_services
test_apiserver() {
+ rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
&& RAILS_ENV=test bundle exec rake test TESTOPTS=-v ${testargs[services/api]}
}
commit 76624e2dfb931459a7251643d59665d1c7d4ce4d
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Mar 9 13:36:16 2016 -0500
8491: --retry applies to do_install too
diff --git a/build/run-tests.sh b/build/run-tests.sh
index fd64fe3..38ac98a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -487,8 +487,8 @@ timer() {
echo -n "$(($SECONDS - $t0))s"
}
-do_test() {
- while ! do_test_once ${@} && [[ "$retry" == 1 ]]
+retry() {
+ while ! ${@} && [[ "$retry" == 1 ]]
do
read -p 'Try again? [Y/n] ' x
if [[ "$x" != "y" ]] && [[ "$x" != "" ]]
@@ -498,6 +498,10 @@ do_test() {
done
}
+do_test() {
+ retry do_test_once ${@}
+}
+
do_test_once() {
unset result
if [[ -z "${skip[$1]}" ]] && ( [[ -z "$only" ]] || [[ "$only" == "$1" ]] )
@@ -550,6 +554,10 @@ do_test_once() {
}
do_install() {
+ retry do_install_once ${@}
+}
+
+do_install_once() {
if [[ -z "$skip_install" || (-n "$only_install" && "$only_install" == "$1") ]]
then
title "Running $1 install"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list