diff options
author | Lars Wirzenius <liw@liw.fi> | 2020-09-26 20:36:44 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2020-09-26 20:36:44 +0300 |
commit | e7500bdc1446124c152fed066b35b532d9e46cad (patch) | |
tree | 236d5c3ca975196a935690f60dc50ef105f6c2a6 /subplot.py | |
parent | 61f68650e69d62ea9ba91bc9a917e6bc64941979 (diff) | |
download | subplot-e7500bdc1446124c152fed066b35b532d9e46cad.tar.gz |
fix(subplot.py): make lintable
While this module is intended to be inserted into the Subplot Python
template, and it works, it's not cleanly lintable, as the linters
don't understand about the template. Fix this by retrieving any
symbols used from the template via the globals() dict.
Diffstat (limited to 'subplot.py')
-rw-r--r-- | subplot.py | 52 |
1 files changed, 49 insertions, 3 deletions
@@ -1,38 +1,50 @@ import json import os -import re -import subprocess -import time def try_docgen(ctx, md=None, output=None): + runcmd = globals()["runcmd"] + docgen = binary("sp-docgen") runcmd(ctx, [docgen, md, "-o", output]) def run_docgen(ctx, md=None, output=None): + exit_code_is = globals()["exit_code_is"] + try_docgen(ctx, md=md, output=output) exit_code_is(ctx, 0) def run_docgen_with_date(ctx, md=None, output=None, date=None): + exit_code_is = globals()["exit_code_is"] + runcmd = globals()["runcmd"] + docgen = binary("sp-docgen") runcmd(ctx, [docgen, md, "-o", output, "--date", date]) exit_code_is(ctx, 0) def try_codegen_and_program(ctx, filename=None, testprog=None): + runcmd = globals()["runcmd"] + srcdir = globals()["srcdir"] + codegen = binary("sp-codegen") tmpldir = os.path.join(srcdir, "templates") runcmd(ctx, [codegen, filename, "-o", testprog, "--run", "--templates", tmpldir]) def run_codegen_and_program(ctx, filename=None, testprog=None): + exit_code_is = globals()["exit_code_is"] try_codegen_and_program(ctx, filename=filename, testprog=testprog) exit_code_is(ctx, 0) def run_codegen(ctx, filename=None, testprog=None): + runcmd = globals()["runcmd"] + srcdir = globals()["srcdir"] + exit_code_is = globals()["exit_code_is"] + codegen = binary("sp-codegen") tmpldir = os.path.join(srcdir, "templates") runcmd(ctx, [codegen, filename, "-o", testprog, "--templates", tmpldir]) @@ -40,52 +52,74 @@ def run_codegen(ctx, filename=None, testprog=None): def run_python_test_program(ctx, testprog=None, pattern=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + runcmd(ctx, ["python3", testprog, pattern]) exit_code_is(ctx, 0) def run_bash_test_program(ctx, testprog=None, pattern=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + runcmd(ctx, ["bash", testprog, pattern]) exit_code_is(ctx, 0) def run_meta(ctx, filename=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + meta = binary("sp-meta") runcmd(ctx, [meta, filename]) exit_code_is(ctx, 0) def run_meta_json(ctx, filename=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + meta = binary("sp-meta") runcmd(ctx, [meta, filename, "-o", "json"]) exit_code_is(ctx, 0) def run_extract(ctx, filename=None, embedded=None, dirname=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + extract = binary("sp-extract") runcmd(ctx, [extract, filename, embedded, "-o", dirname]) exit_code_is(ctx, 0) def run_pandoc_with_filter(ctx, filename=None, output=None): + runcmd = globals()["runcmd"] + exit_code_is = globals()["exit_code_is"] + sp_filter = binary("sp-filter") runcmd(ctx, ["pandoc", "--filter", sp_filter, filename, "-o", output]) exit_code_is(ctx, 0) def scenario_was_run(ctx, name=None): + stdout_contains = globals()["stdout_contains"] stdout_contains(ctx, pattern="\nscenario: {}\n".format(name)) def scenario_was_not_run(ctx, name=None): + stdout_does_not_contain = globals()["stdout_does_not_contain"] stdout_does_not_contain(ctx, pattern="\nscenario: {}\n".format(name)) def step_was_run(ctx, keyword=None, name=None): + stdout_contains = globals()["stdout_contains"] stdout_contains(ctx, pattern="\n step: {} {}\n".format(keyword, name)) def step_was_run_and_then(ctx, keyword1=None, name1=None, keyword2=None, name2=None): + stdout_contains = globals()["stdout_contains"] stdout_contains( ctx, pattern="\n step: {} {}\n step: {} {}".format( @@ -95,6 +129,7 @@ def step_was_run_and_then(ctx, keyword1=None, name1=None, keyword2=None, name2=N def cleanup_was_run(ctx, keyword1=None, name1=None, keyword2=None, name2=None): + stdout_contains = globals()["stdout_contains"] stdout_contains( ctx, pattern="\n cleanup: {} {}\n cleanup: {} {}\n".format( @@ -104,22 +139,30 @@ def cleanup_was_run(ctx, keyword1=None, name1=None, keyword2=None, name2=None): def cleanup_was_not_run(ctx, keyword=None, name=None): + stdout_does_not_contain = globals()["stdout_does_not_contain"] stdout_does_not_contain(ctx, pattern="\n cleanup: {} {}\n".format(keyword, name)) def json_output_matches_file(ctx, filename=None): + assert_dict_eq = globals()["assert_dict_eq"] + actual = json.loads(ctx["stdout"]) expected = json.load(open(filename)) assert_dict_eq(actual, expected) def file_ends_in_zero_newlines(ctx, filename=None): + assert_ne = globals()["assert_ne"] + content = open(filename, "r").read() print("content:", repr(content)) assert_ne(content[-1], "\n") def file_ends_in_one_newline(ctx, filename=None): + assert_eq = globals()["assert_eq"] + assert_ne = globals()["assert_ne"] + content = open(filename, "r").read() print("content:", repr(content)) assert_eq(content[-1], "\n") @@ -127,10 +170,13 @@ def file_ends_in_one_newline(ctx, filename=None): def file_ends_in_two_newlines(ctx, filename=None): + assert_eq = globals()["assert_eq"] + content = open(filename, "r").read() print("content:", repr(content)) assert_eq(content[-2:], "\n\n") def binary(basename): + srcdir = globals()["srcdir"] return os.path.join(srcdir, "target", "debug", basename) |