From 3649e2777099054cbfc5bcdb7d0be837d05ebfb3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Jun 2013 10:36:49 -0700 Subject: [PATCH] admin_socket: fetch test from correct branch --- teuthology/task/admin_socket.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/teuthology/task/admin_socket.py b/teuthology/task/admin_socket.py index 85d0b2a6cae2a..3bb8296d9dc58 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', -- 2.39.5