From 12b79044f41bb3dd78e55b98deb369971ebe6d0a Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 13 Feb 2014 19:57:51 -0800 Subject: [PATCH] Review: Rename calamari_testdir/ to calamari/ --- teuthology/task/calamari.py | 3 +-- teuthology/task/{calamari_testdir => calamari}/http_client.py | 0 .../task/{calamari_testdir => calamari}/servertest_1_0.py | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename teuthology/task/{calamari_testdir => calamari}/http_client.py (100%) rename teuthology/task/{calamari_testdir => calamari}/servertest_1_0.py (100%) diff --git a/teuthology/task/calamari.py b/teuthology/task/calamari.py index 6d93dd2d20..221004033c 100644 --- a/teuthology/task/calamari.py +++ b/teuthology/task/calamari.py @@ -453,8 +453,7 @@ def test(ctx, config): testhost = ctx.cluster.only(config['server']).remotes.keys()[0].name testhost = testhost.split('@')[1] mypath = os.path.dirname(__file__) - cmd_list = [os.path.join(mypath, 'calamari_testdir', - 'test_server_1_0.py')] + cmd_list = [os.path.join(mypath, 'calamari', 'servertest_1_0.py')] os.environ['CALAMARI_BASE_URI'] = 'http://{0}/api/v1/'.format(testhost) log.info("testing %s", testhost) return subprocess.call(cmd_list) diff --git a/teuthology/task/calamari_testdir/http_client.py b/teuthology/task/calamari/http_client.py similarity index 100% rename from teuthology/task/calamari_testdir/http_client.py rename to teuthology/task/calamari/http_client.py diff --git a/teuthology/task/calamari_testdir/servertest_1_0.py b/teuthology/task/calamari/servertest_1_0.py similarity index 100% rename from teuthology/task/calamari_testdir/servertest_1_0.py rename to teuthology/task/calamari/servertest_1_0.py -- 2.39.5