forked from platformio/platformio-core
		
	Introduce Black to automate code formatting
This commit is contained in:
		@@ -31,51 +31,72 @@ from platformio.project.helpers import get_project_test_dir
 | 
			
		||||
 | 
			
		||||
@click.command("test", short_help="Unit Testing")
 | 
			
		||||
@click.option("--environment", "-e", multiple=True, metavar="<environment>")
 | 
			
		||||
@click.option("--filter",
 | 
			
		||||
              "-f",
 | 
			
		||||
              multiple=True,
 | 
			
		||||
              metavar="<pattern>",
 | 
			
		||||
              help="Filter tests by a pattern")
 | 
			
		||||
@click.option("--ignore",
 | 
			
		||||
              "-i",
 | 
			
		||||
              multiple=True,
 | 
			
		||||
              metavar="<pattern>",
 | 
			
		||||
              help="Ignore tests by a pattern")
 | 
			
		||||
@click.option(
 | 
			
		||||
    "--filter",
 | 
			
		||||
    "-f",
 | 
			
		||||
    multiple=True,
 | 
			
		||||
    metavar="<pattern>",
 | 
			
		||||
    help="Filter tests by a pattern",
 | 
			
		||||
)
 | 
			
		||||
@click.option(
 | 
			
		||||
    "--ignore",
 | 
			
		||||
    "-i",
 | 
			
		||||
    multiple=True,
 | 
			
		||||
    metavar="<pattern>",
 | 
			
		||||
    help="Ignore tests by a pattern",
 | 
			
		||||
)
 | 
			
		||||
@click.option("--upload-port")
 | 
			
		||||
@click.option("--test-port")
 | 
			
		||||
@click.option("-d",
 | 
			
		||||
              "--project-dir",
 | 
			
		||||
              default=getcwd,
 | 
			
		||||
              type=click.Path(exists=True,
 | 
			
		||||
                              file_okay=False,
 | 
			
		||||
                              dir_okay=True,
 | 
			
		||||
                              writable=True,
 | 
			
		||||
                              resolve_path=True))
 | 
			
		||||
@click.option("-c",
 | 
			
		||||
              "--project-conf",
 | 
			
		||||
              type=click.Path(exists=True,
 | 
			
		||||
                              file_okay=True,
 | 
			
		||||
                              dir_okay=False,
 | 
			
		||||
                              readable=True,
 | 
			
		||||
                              resolve_path=True))
 | 
			
		||||
@click.option(
 | 
			
		||||
    "-d",
 | 
			
		||||
    "--project-dir",
 | 
			
		||||
    default=getcwd,
 | 
			
		||||
    type=click.Path(
 | 
			
		||||
        exists=True, file_okay=False, dir_okay=True, writable=True, resolve_path=True
 | 
			
		||||
    ),
 | 
			
		||||
)
 | 
			
		||||
@click.option(
 | 
			
		||||
    "-c",
 | 
			
		||||
    "--project-conf",
 | 
			
		||||
    type=click.Path(
 | 
			
		||||
        exists=True, file_okay=True, dir_okay=False, readable=True, resolve_path=True
 | 
			
		||||
    ),
 | 
			
		||||
)
 | 
			
		||||
@click.option("--without-building", is_flag=True)
 | 
			
		||||
@click.option("--without-uploading", is_flag=True)
 | 
			
		||||
@click.option("--without-testing", is_flag=True)
 | 
			
		||||
@click.option("--no-reset", is_flag=True)
 | 
			
		||||
@click.option("--monitor-rts",
 | 
			
		||||
              default=None,
 | 
			
		||||
              type=click.IntRange(0, 1),
 | 
			
		||||
              help="Set initial RTS line state for Serial Monitor")
 | 
			
		||||
@click.option("--monitor-dtr",
 | 
			
		||||
              default=None,
 | 
			
		||||
              type=click.IntRange(0, 1),
 | 
			
		||||
              help="Set initial DTR line state for Serial Monitor")
 | 
			
		||||
@click.option(
 | 
			
		||||
    "--monitor-rts",
 | 
			
		||||
    default=None,
 | 
			
		||||
    type=click.IntRange(0, 1),
 | 
			
		||||
    help="Set initial RTS line state for Serial Monitor",
 | 
			
		||||
)
 | 
			
		||||
@click.option(
 | 
			
		||||
    "--monitor-dtr",
 | 
			
		||||
    default=None,
 | 
			
		||||
    type=click.IntRange(0, 1),
 | 
			
		||||
    help="Set initial DTR line state for Serial Monitor",
 | 
			
		||||
)
 | 
			
		||||
@click.option("--verbose", "-v", is_flag=True)
 | 
			
		||||
@click.pass_context
 | 
			
		||||
def cli(  # pylint: disable=redefined-builtin
 | 
			
		||||
        ctx, environment, ignore, filter, upload_port, test_port, project_dir,
 | 
			
		||||
        project_conf, without_building, without_uploading, without_testing,
 | 
			
		||||
        no_reset, monitor_rts, monitor_dtr, verbose):
 | 
			
		||||
    ctx,
 | 
			
		||||
    environment,
 | 
			
		||||
    ignore,
 | 
			
		||||
    filter,
 | 
			
		||||
    upload_port,
 | 
			
		||||
    test_port,
 | 
			
		||||
    project_dir,
 | 
			
		||||
    project_conf,
 | 
			
		||||
    without_building,
 | 
			
		||||
    without_uploading,
 | 
			
		||||
    without_testing,
 | 
			
		||||
    no_reset,
 | 
			
		||||
    monitor_rts,
 | 
			
		||||
    monitor_dtr,
 | 
			
		||||
    verbose,
 | 
			
		||||
):
 | 
			
		||||
    with fs.cd(project_dir):
 | 
			
		||||
        test_dir = get_project_test_dir()
 | 
			
		||||
        if not isdir(test_dir):
 | 
			
		||||
@@ -83,7 +104,8 @@ def cli(  # pylint: disable=redefined-builtin
 | 
			
		||||
        test_names = get_test_names(test_dir)
 | 
			
		||||
 | 
			
		||||
        config = ProjectConfig.get_instance(
 | 
			
		||||
            project_conf or join(project_dir, "platformio.ini"))
 | 
			
		||||
            project_conf or join(project_dir, "platformio.ini")
 | 
			
		||||
        )
 | 
			
		||||
        config.validate(envs=environment)
 | 
			
		||||
 | 
			
		||||
        click.echo("Verbose mode can be enabled via `-v, --verbose` option")
 | 
			
		||||
@@ -99,19 +121,16 @@ def cli(  # pylint: disable=redefined-builtin
 | 
			
		||||
                # filter and ignore patterns
 | 
			
		||||
                patterns = dict(filter=list(filter), ignore=list(ignore))
 | 
			
		||||
                for key in patterns:
 | 
			
		||||
                    patterns[key].extend(
 | 
			
		||||
                        config.get(section, "test_%s" % key, []))
 | 
			
		||||
                    patterns[key].extend(config.get(section, "test_%s" % key, []))
 | 
			
		||||
 | 
			
		||||
                skip_conditions = [
 | 
			
		||||
                    environment and envname not in environment,
 | 
			
		||||
                    not environment and default_envs
 | 
			
		||||
                    and envname not in default_envs,
 | 
			
		||||
                    testname != "*" and patterns['filter'] and
 | 
			
		||||
                    not any([fnmatch(testname, p)
 | 
			
		||||
                             for p in patterns['filter']]),
 | 
			
		||||
                    not environment and default_envs and envname not in default_envs,
 | 
			
		||||
                    testname != "*"
 | 
			
		||||
                    and any([fnmatch(testname, p)
 | 
			
		||||
                             for p in patterns['ignore']]),
 | 
			
		||||
                    and patterns["filter"]
 | 
			
		||||
                    and not any([fnmatch(testname, p) for p in patterns["filter"]]),
 | 
			
		||||
                    testname != "*"
 | 
			
		||||
                    and any([fnmatch(testname, p) for p in patterns["ignore"]]),
 | 
			
		||||
                ]
 | 
			
		||||
                if any(skip_conditions):
 | 
			
		||||
                    results.append({"env": envname, "test": testname})
 | 
			
		||||
@@ -120,29 +139,36 @@ def cli(  # pylint: disable=redefined-builtin
 | 
			
		||||
                click.echo()
 | 
			
		||||
                print_processing_header(testname, envname)
 | 
			
		||||
 | 
			
		||||
                cls = (NativeTestProcessor
 | 
			
		||||
                       if config.get(section, "platform") == "native" else
 | 
			
		||||
                       EmbeddedTestProcessor)
 | 
			
		||||
                cls = (
 | 
			
		||||
                    NativeTestProcessor
 | 
			
		||||
                    if config.get(section, "platform") == "native"
 | 
			
		||||
                    else EmbeddedTestProcessor
 | 
			
		||||
                )
 | 
			
		||||
                tp = cls(
 | 
			
		||||
                    ctx, testname, envname,
 | 
			
		||||
                    dict(project_config=config,
 | 
			
		||||
                         project_dir=project_dir,
 | 
			
		||||
                         upload_port=upload_port,
 | 
			
		||||
                         test_port=test_port,
 | 
			
		||||
                         without_building=without_building,
 | 
			
		||||
                         without_uploading=without_uploading,
 | 
			
		||||
                         without_testing=without_testing,
 | 
			
		||||
                         no_reset=no_reset,
 | 
			
		||||
                         monitor_rts=monitor_rts,
 | 
			
		||||
                         monitor_dtr=monitor_dtr,
 | 
			
		||||
                         verbose=verbose))
 | 
			
		||||
                    ctx,
 | 
			
		||||
                    testname,
 | 
			
		||||
                    envname,
 | 
			
		||||
                    dict(
 | 
			
		||||
                        project_config=config,
 | 
			
		||||
                        project_dir=project_dir,
 | 
			
		||||
                        upload_port=upload_port,
 | 
			
		||||
                        test_port=test_port,
 | 
			
		||||
                        without_building=without_building,
 | 
			
		||||
                        without_uploading=without_uploading,
 | 
			
		||||
                        without_testing=without_testing,
 | 
			
		||||
                        no_reset=no_reset,
 | 
			
		||||
                        monitor_rts=monitor_rts,
 | 
			
		||||
                        monitor_dtr=monitor_dtr,
 | 
			
		||||
                        verbose=verbose,
 | 
			
		||||
                    ),
 | 
			
		||||
                )
 | 
			
		||||
                result = {
 | 
			
		||||
                    "env": envname,
 | 
			
		||||
                    "test": testname,
 | 
			
		||||
                    "duration": time(),
 | 
			
		||||
                    "succeeded": tp.process()
 | 
			
		||||
                    "succeeded": tp.process(),
 | 
			
		||||
                }
 | 
			
		||||
                result['duration'] = time() - result['duration']
 | 
			
		||||
                result["duration"] = time() - result["duration"]
 | 
			
		||||
                results.append(result)
 | 
			
		||||
 | 
			
		||||
                print_processing_footer(result)
 | 
			
		||||
@@ -168,8 +194,13 @@ def get_test_names(test_dir):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def print_processing_header(test, env):
 | 
			
		||||
    click.echo("Processing %s in %s environment" % (click.style(
 | 
			
		||||
        test, fg="yellow", bold=True), click.style(env, fg="cyan", bold=True)))
 | 
			
		||||
    click.echo(
 | 
			
		||||
        "Processing %s in %s environment"
 | 
			
		||||
        % (
 | 
			
		||||
            click.style(test, fg="yellow", bold=True),
 | 
			
		||||
            click.style(env, fg="cyan", bold=True),
 | 
			
		||||
        )
 | 
			
		||||
    )
 | 
			
		||||
    terminal_width, _ = click.get_terminal_size()
 | 
			
		||||
    click.secho("-" * terminal_width, bold=True)
 | 
			
		||||
 | 
			
		||||
@@ -177,10 +208,17 @@ def print_processing_header(test, env):
 | 
			
		||||
def print_processing_footer(result):
 | 
			
		||||
    is_failed = not result.get("succeeded")
 | 
			
		||||
    util.print_labeled_bar(
 | 
			
		||||
        "[%s] Took %.2f seconds" %
 | 
			
		||||
        ((click.style("FAILED", fg="red", bold=True) if is_failed else
 | 
			
		||||
          click.style("PASSED", fg="green", bold=True)), result['duration']),
 | 
			
		||||
        is_error=is_failed)
 | 
			
		||||
        "[%s] Took %.2f seconds"
 | 
			
		||||
        % (
 | 
			
		||||
            (
 | 
			
		||||
                click.style("FAILED", fg="red", bold=True)
 | 
			
		||||
                if is_failed
 | 
			
		||||
                else click.style("PASSED", fg="green", bold=True)
 | 
			
		||||
            ),
 | 
			
		||||
            result["duration"],
 | 
			
		||||
        ),
 | 
			
		||||
        is_error=is_failed,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def print_testing_summary(results):
 | 
			
		||||
@@ -203,20 +241,32 @@ def print_testing_summary(results):
 | 
			
		||||
            status_str = click.style("PASSED", fg="green")
 | 
			
		||||
 | 
			
		||||
        tabular_data.append(
 | 
			
		||||
            (result['test'], click.style(result['env'], fg="cyan"), status_str,
 | 
			
		||||
             util.humanize_duration_time(result.get("duration"))))
 | 
			
		||||
            (
 | 
			
		||||
                result["test"],
 | 
			
		||||
                click.style(result["env"], fg="cyan"),
 | 
			
		||||
                status_str,
 | 
			
		||||
                util.humanize_duration_time(result.get("duration")),
 | 
			
		||||
            )
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    click.echo(tabulate(tabular_data,
 | 
			
		||||
                        headers=[
 | 
			
		||||
                            click.style(s, bold=True)
 | 
			
		||||
                            for s in ("Test", "Environment", "Status",
 | 
			
		||||
                                      "Duration")
 | 
			
		||||
                        ]),
 | 
			
		||||
               err=failed_nums)
 | 
			
		||||
    click.echo(
 | 
			
		||||
        tabulate(
 | 
			
		||||
            tabular_data,
 | 
			
		||||
            headers=[
 | 
			
		||||
                click.style(s, bold=True)
 | 
			
		||||
                for s in ("Test", "Environment", "Status", "Duration")
 | 
			
		||||
            ],
 | 
			
		||||
        ),
 | 
			
		||||
        err=failed_nums,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    util.print_labeled_bar(
 | 
			
		||||
        "%s%d succeeded in %s" %
 | 
			
		||||
        ("%d failed, " % failed_nums if failed_nums else "", succeeded_nums,
 | 
			
		||||
         util.humanize_duration_time(duration)),
 | 
			
		||||
        "%s%d succeeded in %s"
 | 
			
		||||
        % (
 | 
			
		||||
            "%d failed, " % failed_nums if failed_nums else "",
 | 
			
		||||
            succeeded_nums,
 | 
			
		||||
            util.humanize_duration_time(duration),
 | 
			
		||||
        ),
 | 
			
		||||
        is_error=failed_nums,
 | 
			
		||||
        fg="red" if failed_nums else "green")
 | 
			
		||||
        fg="red" if failed_nums else "green",
 | 
			
		||||
    )
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user