[ARVADOS] updated: 1.3.0-1192-gcc3eccee8

Git user git at public.curoverse.com
Fri Jul 12 20:46:37 UTC 2019


Summary of changes:
 sdk/python/tests/run_test_server.py | 2 +-
 services/fuse/tests/test_mount.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  cc3eccee85114bacf0721eb7477fd7ae68295c89 (commit)
       via  55be82a4d18a607e34e8843b561e2671f809780d (commit)
      from  bd54b908943ce02edf1400fe8879f2383ad1c054 (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 cc3eccee85114bacf0721eb7477fd7ae68295c89
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Fri Jul 12 16:46:08 2019 -0400

    14965: Fixes port waiting regex
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 20a6111dd..0edfab151 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -190,7 +190,7 @@ def _wait_until_port_listens(port, timeout=10, warn=True):
         return
     deadline = time.time() + timeout
     while time.time() < deadline:
-        if re.search(r'\ntcp.*:'+str(port)+' .* LISTEN *\n', str(subprocess.check_output(['netstat', '-Wln']))):
+        if re.search(r'\ntcp.*:'+str(port)+' .* LISTEN *\n', subprocess.check_output(['netstat', '-Wln']).decode()):
             return True
         time.sleep(0.1)
     if warn:

commit 55be82a4d18a607e34e8843b561e2671f809780d
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Fri Jul 12 15:29:46 2019 -0400

    14965: Clarifies decoding in pdh test
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 51edfa888..f0d2260b5 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -1167,11 +1167,11 @@ class FuseMagicTestPDHOnly(MountTestBase):
                       llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
 
         files = {}
-        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1'
+        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1'
 
         for k, v in viewitems(files):
             with open(os.path.join(self.mounttmp, k), 'rb') as f:
-                self.assertEqual(v, f.read())
+                self.assertEqual(v, f.read().decode())
 
         # look up using uuid should fail when pdh_only is set
         if pdh_only is True:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list