[ARVADOS] updated: bfd037dee4c82f355816c449dd25921fc2923837

[git at public.curoverse.com]

Summary of changes:
 sdk/python/run_test_server.py |   22 +++++++++++-----------
 sdk/python/test_mount.py      |    3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

       via  bfd037dee4c82f355816c449dd25921fc2923837 (commit)
      from  ef47dfeb871015d9da6d5e2e0a04100c2e9e8eee (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 bfd037dee4c82f355816c449dd25921fc2923837
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 8 17:10:07 2014 -0400

    Fixed stop_keep().  Updated test_mount because the fixture changed (again).

diff --git a/sdk/python/run_test_server.py b/sdk/python/run_test_server.py
index 6aceb05..9ded55d 100644
--- a/sdk/python/run_test_server.py
+++ b/sdk/python/run_test_server.py
@@ -126,12 +126,11 @@ def run_keep():
     cwd = os.getcwd()
     os.chdir(os.path.join(os.path.dirname(__file__), KEEP_SERVER_DIR))
     os.environ["GOPATH"] = os.getcwd()
+    subprocess.call(["go", "install", "keep"])
 
-    shutil.rmtree("tmp", True)
-    os.mkdir("tmp")
+    if not os.path.exists("tmp"):
+        os.mkdir("tmp")
 
-    keep1 = tempfile.mkdtemp()
-    subprocess.call(["go", "install", "keep"])
     _start_keep(0)
     _start_keep(1)
 
@@ -146,17 +145,18 @@ def run_keep():
 
     os.chdir(cwd)
 
+def _stop_keep(n):
+    kill_server_pid("tmp/keep{}.pid".format(n), 0)
+    if os.path.exists("tmp/keep{}.volume".format(n)):
+        with open("tmp/keep{}.volume".format(n), 'r') as r:
+            shutil.rmtree(r.read(), True)
+
 def stop_keep():
     cwd = os.getcwd()
     os.chdir(os.path.join(os.path.dirname(__file__), KEEP_SERVER_DIR))
 
-    kill_server_pid("keep0.pid", 0)
-    kill_server_pid("keep1.pid", 0)
-
-    with open("keep0.volume", 'r') as r:
-        shutil.rmtree(r.read(), True)
-    with open("keep1.volume", 'r') as r:
-        shutil.rmtree(r.read(), True)
+    _stop_keep(0)
+    _stop_keep(1)
 
     shutil.rmtree("tmp", True)
 
diff --git a/sdk/python/test_mount.py b/sdk/python/test_mount.py
index f2a84cc..356c9d4 100644
--- a/sdk/python/test_mount.py
+++ b/sdk/python/test_mount.py
@@ -308,7 +308,8 @@ class FuseGroupsTest(MountTestBase):
 
         d2 = os.listdir(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso'))
         d2.sort()
-        self.assertEqual(["I'm a job in a folder",
+        self.assertEqual(['1f4b0bc7583c2a7f9102c395f4ffc5e3+45 added sometime',
+                          "I'm a job in a folder",
                           "I'm a template in a folder",
                           "zzzzz-j58dm-5gid26432uujf79",
                           "zzzzz-j58dm-7r18rnd5nzhg5yk",

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


hooks/post-receive
--