[arvados] updated: 2.6.0-340-gde9d73176

[git repository hosting]

Summary of changes:
 sdk/python/tests/run_test_server.py |  6 +++---
 services/fuse/tests/test_exec.py    | 16 ++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

       via  de9d73176a3cc5c965e10664c626348c575dfc98 (commit)
       via  29da9b6d53d021fe02c78220fa9afc37384d0395 (commit)
       via  63c629b080e1e98b4517510d43f72a6413343756 (commit)
      from  0630e05d68440e421d622d1f26e956c65f3d9668 (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 de9d73176a3cc5c965e10664c626348c575dfc98
Merge: 0630e05d6 29da9b6d5
Author: Brett Smith <brett.smith at curii.com>
Date:   Wed Jul 5 15:46:21 2023 -0400

    Merge branch '20710-shlex-quoting'
    
    Closes #20710.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>


commit 29da9b6d53d021fe02c78220fa9afc37384d0395
Author: Brett Smith <brett.smith at curii.com>
Date:   Wed Jul 5 15:45:25 2023 -0400

    20710: Remove old backwards compatibility import fallback
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/services/fuse/tests/test_exec.py b/services/fuse/tests/test_exec.py
index 6af60302b..f97799002 100644
--- a/services/fuse/tests/test_exec.py
+++ b/services/fuse/tests/test_exec.py
@@ -9,16 +9,12 @@ import json
 import multiprocessing
 import os
 from . import run_test_server
+import shlex
 import tempfile
 import unittest
 
 from .integration_test import workerPool
 
-try:
-    from shlex import quote
-except:
-    from pipes import quote
-
 def try_exec(mnt, cmd):
     try:
         os.environ['KEEP_LOCAL_STORE'] = tempfile.mkdtemp()
@@ -56,11 +52,11 @@ class ExecMode(unittest.TestCase):
 
     def test_exec(self):
         workerPool().apply(try_exec, (self.mnt, [
-            'sh', '-c',
-            'echo -n foo >{}; cp {} {}'.format(
-                quote(os.path.join(self.mnt, 'zzz', 'foo.txt')),
-                quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')),
-                quote(os.path.join(self.okfile)))]))
+            'sh', '-c', 'echo -n foo >{}; cp {} {}'.format(
+                shlex.quote(os.path.join(self.mnt, 'zzz', 'foo.txt')),
+                shlex.quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')),
+                shlex.quote(os.path.join(self.okfile)),
+            )]))
         with open(self.okfile) as f:
             assertRegex(
                 self,

-----------------------------------------------------------------------


hooks/post-receive
--