From: Sage Weil <sage@inktank.com>
Date: Wed, 19 Jun 2013 17:36:49 +0000 (-0700)
Subject: admin_socket: fetch test from correct branch
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e62ee1774cd5b772522394fe9e01e595e7a7a65;p=teuthology.git

admin_socket: fetch test from correct branch
(cherry picked from commit 3649e2777099054cbfc5bcdb7d0be837d05ebfb3)
---

diff --git a/teuthology/task/admin_socket.py b/teuthology/task/admin_socket.py
index 85d0b2a6c..3bb8296d9 100644
--- a/teuthology/task/admin_socket.py
+++ b/teuthology/task/admin_socket.py
@@ -90,6 +90,7 @@ def _run_tests(ctx, client, tests):
     log.debug('Running admin socket tests on %s', client)
     (remote,) = ctx.cluster.only(client).remotes.iterkeys()
     socket_path = '/var/run/ceph/ceph-{name}.asok'.format(name=client)
+    overrides = ctx.config.get('overrides', {}).get('admin_socket', {})
 
     try:
         tmp_dir = os.path.join(
@@ -111,10 +112,14 @@ def _run_tests(ctx, client, tests):
         for command, config in tests.iteritems():
             if config is None:
                 config = {}
+            teuthology.deep_merge(config, overrides)
             log.debug('Testing %s with config %s', command, str(config))
 
             test_path = None
             if 'test' in config:
+                url = config['test'].format(
+                    branch=config.get('branch', 'master')
+                    )
                 test_path = os.path.join(tmp_dir, command)
                 remote.run(
                     args=[
@@ -123,7 +128,7 @@ def _run_tests(ctx, client, tests):
                         '-O',
                         test_path,
                         '--',
-                        config['test'],
+                        url,
                         run.Raw('&&'),
                         'chmod',
                         'u=rx',