From 161cd6ead960ecf6afc05bd583718724140d6973 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 6 Apr 2019 15:08:44 +0300 Subject: Refactor: use name V instead of vars in yarn implements vars is a Python builtin, and as such it's not a great name. --- yarns/900-local.yarn | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'yarns/900-local.yarn') diff --git a/yarns/900-local.yarn b/yarns/900-local.yarn index 4a315ae..5fa06f3 100644 --- a/yarns/900-local.yarn +++ b/yarns/900-local.yarn @@ -39,48 +39,48 @@ along with this program. If not, see . ] token = cliapp.runcmd(argv, feed_stdin=key) store_token(user, token) - vars['issuer'] = 'localhost' - vars['audience'] = user + V['issuer'] = 'localhost' + V['audience'] = user ## Controller configuration IMPLEMENTS GIVEN controller config uses (\S+) at the state directory - vars['statedir'] = get_next_match() + V['statedir'] = get_next_match() IMPLEMENTS GIVEN controller config uses (\S+) as artifact store - vars['artifact_store'] = get_next_match() + V['artifact_store'] = get_next_match() IMPLEMENTS GIVEN controller config uses (\S+) as authentication - vars['auth_url'] = get_next_match() + V['auth_url'] = get_next_match() IMPLEMENTS GIVEN controller config uses (\S+) as notify - vars['notify_url'] = get_next_match() - assert vars['notify_url'] is not None + V['notify_url'] = get_next_match() + assert V['notify_url'] is not None ## Start and stop the controller IMPLEMENTS GIVEN a running ick controller import os, time, cliapp, yaml - vars['controller.log'] = 'ick_controller.log' - vars['gunicorn3.log'] = 'gunicorn3.log' - vars['port'] = random_free_port() - vars['url'] = 'http://127.0.0.1:{}'.format(vars['port']) - assert vars['auth_url'] is not None - assert vars['notify_url'] is not None + V['controller.log'] = 'ick_controller.log' + V['gunicorn3.log'] = 'gunicorn3.log' + V['port'] = random_free_port() + V['url'] = 'http://127.0.0.1:{}'.format(V['port']) + assert V['auth_url'] is not None + assert V['notify_url'] is not None config = { - 'token-issuer': vars['issuer'], - 'token-audience': vars['audience'], + 'token-issuer': V['issuer'], + 'token-audience': V['audience'], 'token-public-key': cat('token.key.pub'), 'log': [ { - 'filename': vars['controller.log'], + 'filename': V['controller.log'], }, ], - 'statedir': vars['statedir'], + 'statedir': V['statedir'], 'apt-server': 'localhost', - 'artifact-store': vars['artifact_store'], - 'auth-url': vars['auth_url'], - 'notify-url': vars['notify_url'], + 'artifact-store': V['artifact_store'], + 'auth-url': V['auth_url'], + 'notify-url': V['notify_url'], } assert config['notify-url'] is not None env = dict(os.environ) @@ -89,30 +89,30 @@ along with this program. If not, see . argv = [ 'gunicorn3', '--daemon', - '--bind', '127.0.0.1:{}'.format(vars['port']), - '--log-file', vars['gunicorn3.log'], + '--bind', '127.0.0.1:{}'.format(V['port']), + '--log-file', V['gunicorn3.log'], '--log-level', 'debug', '-p', 'pid', 'ick_controller:app', ] cliapp.runcmd(argv, env=env) - vars['pid'] = int(cat('pid')) - wait_for_port(vars['port']) + V['pid'] = int(cat('pid')) + wait_for_port(V['port']) IMPLEMENTS WHEN user stops ick controller import os, signal - os.kill(int(vars['pid']), signal.SIGTERM) + os.kill(int(V['pid']), signal.SIGTERM) IMPLEMENTS FINALLY stop ick controller import os, signal - os.kill(vars['pid'], signal.SIGTERM) + os.kill(V['pid'], signal.SIGTERM) ## Controller state inspection IMPLEMENTS THEN controller state directory contains project (\S+) name = get_next_match() basename = encode_basename(name) - filename = os.path.join(vars['statedir'], 'projects', basename) + filename = os.path.join(V['statedir'], 'projects', basename) print 'name', name print 'basename', basename print 'filename', filename @@ -121,7 +121,7 @@ along with this program. If not, see . IMPLEMENTS THEN controller state directory contains worker (\S+) name = get_next_match() basename = encode_basename(name) - filename = os.path.join(vars['statedir'], 'workers', basename) + filename = os.path.join(V['statedir'], 'workers', basename) print 'filename', filename assertTrue(os.path.exists(filename)) @@ -129,21 +129,21 @@ along with this program. If not, see . IMPLEMENTS THEN artifact store URL is (\S+) expected = get_next_match() - body = vars['body'] + body = V['body'] obj = json.loads(body) actual = obj['artifact_store'] assertEqual(actual, expected) IMPLEMENTS THEN authentication URL is (\S+) expected = get_next_match() - body = vars['body'] + body = V['body'] obj = json.loads(body) actual = obj['auth_url'] assertEqual(actual, expected) IMPLEMENTS THEN notify URL is (\S+) expected = get_next_match() - body = vars['body'] + body = V['body'] obj = json.loads(body) actual = obj['notify_url'] assertEqual(actual, expected) @@ -151,24 +151,24 @@ along with this program. If not, see . ## Start and stop artifact store IMPLEMENTS GIVEN artifact store config uses (\S+) at the blob directory - vars['blobdir'] = get_next_match() + V['blobdir'] = get_next_match() IMPLEMENTS GIVEN a running artifact store import os, time, cliapp, yaml - vars['artifact_store.log'] = 'artifact_store.log' - vars['gunicorn3_as.log'] = 'gunicorn3_as.log' - vars['bsport'] = random_free_port() - vars['bsurl'] = 'http://127.0.0.1:{}'.format(vars['bsport']) + V['artifact_store.log'] = 'artifact_store.log' + V['gunicorn3_as.log'] = 'gunicorn3_as.log' + V['bsport'] = random_free_port() + V['bsurl'] = 'http://127.0.0.1:{}'.format(V['bsport']) config = { - 'token-issuer': vars['issuer'], - 'token-audience': vars['audience'], + 'token-issuer': V['issuer'], + 'token-audience': V['audience'], 'token-public-key': cat('token.key.pub'), 'log': [ { - 'filename': vars['artifact_store.log'], + 'filename': V['artifact_store.log'], }, ], - 'blobdir': vars['blobdir'], + 'blobdir': V['blobdir'], } env = dict(os.environ) env['ARTIFACT_STORE_CONFIG'] = 'artifact_store.yaml' @@ -176,16 +176,16 @@ along with this program. If not, see . argv = [ 'gunicorn3', '--daemon', - '--bind', '127.0.0.1:{}'.format(vars['bsport']), - '--log-file', vars['gunicorn3_as.log'], + '--bind', '127.0.0.1:{}'.format(V['bsport']), + '--log-file', V['gunicorn3_as.log'], '--log-level', 'debug', '-p', 'bspid', 'artifact_store:app', ] cliapp.runcmd(argv, env=env) - vars['bspid'] = int(cat('bspid')) - wait_for_port(vars['bsport']) + V['bspid'] = int(cat('bspid')) + wait_for_port(V['bsport']) IMPLEMENTS FINALLY stop artifact store import os, signal - os.kill(vars['bspid'], signal.SIGTERM) + os.kill(V['bspid'], signal.SIGTERM) -- cgit v1.2.1