GNOME.org

[Notes] [Git][BuildStream/buildstream][danielsilverstone-ct/further-optimisations] 12 commits: _frontend: Allow printing dependencies using `bst show`

From: Daniel Silverstone <gitlab mg gitlab com>
To: buildstream-notifications-list gnome org
Subject: [Notes] [Git][BuildStream/buildstream][danielsilverstone-ct/further-optimisations] 12 commits: _frontend: Allow printing dependencies using `bst show`
Date: Tue, 12 Feb 2019 15:12:50 +0000

Title: GitLab

Daniel Silverstone pushed to branch danielsilverstone-ct/further-optimisations at BuildStream / buildstream

Commits:

9b6c18e4

by Chandan Singh at 2019-02-12T10:20:52Z

_frontend: Allow printing dependencies using `bst show`

At present, there isn't an easy way to print anything from `bst show`
that would give the users an idea of what the dependency graph looks
like. One could use things like `--deps build`, but that will just print
a list, without any information about the dependency edges.

Add `%{deps}`, `%{build-deps}` and `%{runtime-deps}` format strings to
`bst show` that would simply print the list of all dependencies, build
dependencies and runtime dependencies respectively.

Summary of changes:

  * buildstream/_frontend/cli.py: Add help for new format symbols.
  * buildstream/_frontend/widget.py: Add support for new format symbols
                                     for dependencies.
  * tests/frontend/show.py: Add tests for new format symbols.

126bc006
by Chandan Singh at 2019-02-12T10:23:44Z
```
Re-generate man pages
```

dbce3434

by Chandan Singh at 2019-02-12T12:19:57Z

Merge branch 'chandan/deps' into 'master'

_frontend: Allow printing dependencies using `bst show`

Closes #890

See merge request BuildStream/buildstream!1121

24d29a17

by Javier Jardón at 2019-02-12T12:27:42Z

.gitlab-ci.yml: Add job to run test in current Fedora:29

80dcf65d

by Javier Jardón at 2019-02-12T12:27:42Z

.gitlab-ci.yml: run all generic fedora test in current stable version:29

58b84905

by Javier Jardón at 2019-02-12T12:27:42Z

.gitlab-ci.yml: Remove "tests-python-3.7-stretch" job

Fedora 29 includes python 3.7 so this is not needed anymore

95d9b9ae

by Javier Jardón at 2019-02-12T13:31:56Z

Merge branch 'jjardon/fedora_29' into 'master'

.gitlab-ci.yml: Test with current fedora release: 29

See merge request BuildStream/buildstream!1137

a39c4767

by Daniel Silverstone at 2019-02-12T15:12:30Z

_yaml.py: Only retrieve provenance in node_get() when needed

We were indiscriminately retrieving the node's provenance data in the
`node_get()` function which was accounting for approximately a third of
the total runtime of `node_get()` which dominates pre-scheduler time in
`bst build`.  This change ameliorates that situation by only retrieving
the provenance data when it's actually needed.

Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>

cda03313

by Daniel Silverstone at 2019-02-12T15:12:30Z

_yaml.py: Reduce use of `isinstance()` in `node_sanitize()`

We know that nodes are typically one of:
str, list, dict, bool, tuple, NoneType or our ChainMap
Of these, dict and ChainMap are Mapping, only list is list
and the rest are returned unchanged.  We can reduce/defer our use
of isinstance here, dramatically, improving performance.

Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>

b6f08e1b

by Daniel Silverstone at 2019-02-12T15:12:30Z

_yaml.py: Remove use of isinstance() in `{node,list}_{chain_,}copy`

A non-trivial proportion of time pre-scheduler in `bst build` is spent
copying (or chain-copying) nodes.  Approximately a quarter of the time
spent in that effort is in `isinstance()`.  This removes that CPU load.

Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>

69ee11c6

by Daniel Silverstone at 2019-02-12T15:12:30Z

_yaml.py: Reduce cost of node_final_assertions

By re-using the isinstance replacements from earlier commits and
using a tuple of the string constants for checking for composition
markers, we reduce the cost of node_final_assertions by two thirds
in basic testing.

Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>

0928e570

by Daniel Silverstone at 2019-02-12T15:12:30Z

_context.py: Cache result of get_strict()

While get_strict() doesn't look expensive per-se, it is called so many
times that it is valuable to cache the result once computed.  Since I
don't think it can change once it is computable, cache it immediately
that becomes possible and we save 20s in my test case.

Signed-off-by: Daniel Silverstone <daniel silverstone codethink co uk>

27 changed files:

.gitlab-ci.yml
buildstream/_context.py
buildstream/_frontend/cli.py
buildstream/_frontend/widget.py
buildstream/_yaml.py
man/bst-artifact-checkout.1
man/bst-artifact-log.1
man/bst-artifact-pull.1
man/bst-artifact-push.1
man/bst-artifact-server.1
man/bst-artifact.1
man/bst-build.1
man/bst-help.1
man/bst-init.1
man/bst-shell.1
man/bst-show.1
man/bst-source-checkout.1
man/bst-source-fetch.1
man/bst-source-track.1
man/bst-source.1
man/bst-workspace-close.1
man/bst-workspace-list.1
man/bst-workspace-open.1
man/bst-workspace-reset.1
man/bst-workspace.1
man/bst.1
tests/frontend/show.py

Changes:

.gitlab-ci.yml

@@ -53,26 +53,20 @@ tests-fedora-28:
    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
    <<: *tests
 -tests-ubuntu-18.04:
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991
 +tests-fedora-29:
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
    <<: *tests
 -tests-python-3.7-stretch:
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-python:3.7-stretch-master-46405991
 +tests-ubuntu-18.04:
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991
    <<: *tests
 -  variables:
 -    # Note that we explicitly specify TOXENV in this case because this
 -    # image has both 3.6 and 3.7 versions. python3.6 cannot be removed because
 -    # some of our base dependencies declare it as their runtime dependency.
 -    TOXENV: py37
+-
  tests-centos-7.6:
    <<: *tests
    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-centos:7.6.1810-master-46405991
 -overnight-fedora-28-aarch64:
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-28-master-46405991
 +overnight-fedora-29-aarch64:
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-29-master-47052095
    tags:
      - aarch64
    <<: *tests
@@ -91,7 +85,7 @@ overnight-fedora-28-aarch64:
  tests-unix:
    # Use fedora here, to a) run a test on fedora and b) ensure that we
    # can get rid of ostree - this is not possible with debian-8
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
    <<: *tests
    variables:
      BST_FORCE_BACKEND: "unix"
@@ -109,7 +103,7 @@ tests-unix:
  tests-fedora-missing-deps:
    # Ensure that tests behave nicely while missing bwrap and ostree
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
    <<: *tests
    script:
@@ -128,7 +122,7 @@ tests-fedora-update-deps:
    # Check if the tests pass after updating requirements to their latest
    # allowed version.
    allow_failure: true
 -  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
 +  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095
    <<: *tests
    script:
@@ -289,6 +283,7 @@ coverage:
    dependencies:
    - tests-debian-9
    - tests-fedora-28
 +  - tests-fedora-29
    - tests-fedora-missing-deps
    - tests-ubuntu-18.04
    - tests-unix

buildstream/_context.py

@@ -361,14 +361,17 @@ class Context():
      #    (bool): Whether or not to use strict build plan
+     #
      def get_strict(self):
 +        if self._strict_build_plan is None:
 +            # Either we're not overridden or we've never worked it out before
 +            # so work out if we should be strict, and then cache the result
 +            toplevel = self.get_toplevel_project()
 +            overrides = self.get_overrides(toplevel.name)
 +            self._strict_build_plan = _yaml.node_get(overrides, bool, 'strict', default_value=True)
          # If it was set by the CLI, it overrides any config
 -        if self._strict_build_plan is not None:
 -            return self._strict_build_plan
+-
 -        toplevel = self.get_toplevel_project()
 -        overrides = self.get_overrides(toplevel.name)
 -        return _yaml.node_get(overrides, bool, 'strict', default_value=True)
 +        # Ditto if we've already computed this, then we return the computed
 +        # value which we cache here too.
 +        return self._strict_build_plan
      # get_cache_key():
+     #

buildstream/_frontend/cli.py

@@ -440,6 +440,9 @@ def show(app, elements, deps, except_, order, format_):
          %{public}         Public domain data
          %{workspaced}     If the element is workspaced
          %{workspace-dirs} A list of workspace directories
 +        %{deps}           A list of all dependencies
 +        %{build-deps}     A list of build dependencies
 +        %{runtime-deps}   A list of runtime dependencies
      The value of the %{symbol} without the leading '%' character is understood
      as a pythonic formatting string, so python formatting features apply,

buildstream/_frontend/widget.py

@@ -27,7 +27,7 @@ from ruamel import yaml
  import click
  from . import Profile
 -from .. import Element, Consistency
 +from .. import Element, Consistency, Scope
  from .. import _yaml
  from .. import __version__ as bst_version
  from .._exceptions import ImplError
@@ -435,6 +435,27 @@ class LogLine(Widget):
                      line = p.fmt_subst(
                          line, 'workspace-dirs', '')
 +            # Dependencies
 +            if "%{deps" in format_:
 +                deps = [e.name for e in element.dependencies(Scope.ALL, recurse=False)]
 +                line = p.fmt_subst(
 +                    line, 'deps',
 +                    yaml.safe_dump(deps, default_style=None).rstrip('\n'))
++
 +            # Build Dependencies
 +            if "%{build-deps" in format_:
 +                build_deps = [e.name for e in element.dependencies(Scope.BUILD, recurse=False)]
 +                line = p.fmt_subst(
 +                    line, 'build-deps',
 +                    yaml.safe_dump(build_deps, default_style=False).rstrip('\n'))
++
 +            # Runtime Dependencies
 +            if "%{runtime-deps" in format_:
 +                runtime_deps = [e.name for e in element.dependencies(Scope.RUN, recurse=False)]
 +                line = p.fmt_subst(
 +                    line, 'runtime-deps',
 +                    yaml.safe_dump(runtime_deps, default_style=False).rstrip('\n'))
++
              report += line + '\n'
          return report.rstrip('\n')

buildstream/_yaml.py

@@ -365,8 +365,8 @@ _sentinel = object()
+ #
  def node_get(node, expected_type, key, indices=None, *, default_value=_sentinel, allow_none=False):
      value = node.get(key, default_value)
 -    provenance = node_get_provenance(node)
      if value is _sentinel:
 +        provenance = node_get_provenance(node)
          raise LoadError(LoadErrorReason.INVALID_DATA,
                          "{}: Dictionary did not contain expected key '{}'".format(provenance, key))
@@ -914,6 +914,10 @@ RoundTripRepresenter.add_representer(SanitizedDict,
                                       SafeRepresenter.represent_dict)
 +# Types we can short-circuit in node_sanitize for speed.
 +__SANITIZE_SHORT_CIRCUIT_TYPES = (int, float, str, bool, tuple)
++
++
  # node_sanitize()
+ #
  # Returnes an alphabetically ordered recursive copy
@@ -922,9 +926,21 @@ RoundTripRepresenter.add_representer(SanitizedDict,
  # Only dicts are ordered, list elements are left in order.
+ #
  def node_sanitize(node):
 +    # Short-circuit None which occurs ca. twice per element
 +    if node is None:
 +        return node
++
 +    node_type = type(node)
 +    # Next short-circuit integers, floats, strings, booleans, and tuples
 +    if node_type in __SANITIZE_SHORT_CIRCUIT_TYPES:
 +        return node
 +    # Now short-circuit lists.  Note this is only for the raw list
 +    # type, CommentedSeq and others get caught later.
 +    elif node_type is list:
 +        return [node_sanitize(elt) for elt in node]
 -    if isinstance(node, collections.abc.Mapping):
+-
 +    # Finally ChainMap and dict, and other Mappings need special handling
 +    if node_type in (dict, ChainMap) or isinstance(node, collections.Mapping):
          result = SanitizedDict()
          key_list = [key for key, _ in node_items(node)]
@@ -932,10 +948,12 @@ def node_sanitize(node):
              result[key] = node_sanitize(node[key])
          return result
+-
 +    # Catch the case of CommentedSeq and friends.  This is more rare and so
 +    # we keep complexity down by still using isinstance here.
      elif isinstance(node, list):
          return [node_sanitize(elt) for elt in node]
 +    # Everything else (such as commented scalars) just gets returned as-is.
      return node
@@ -1064,15 +1082,52 @@ class ChainMap(collections.ChainMap):
              return default
 +# Node copying
 +#
 +# Unfortunately we copy nodes a *lot* and `isinstance()` is super-slow when
 +# things from collections.abc get involved.  The result is the following
 +# intricate but substantially faster group of tuples and the use of `in`.
 +#
 +# If any of the {node,list}_{chain_,}_copy routines raise a ValueError
 +# then it's likely additional types need adding to these tuples.
++
 +# When chaining a copy, these types are skipped since the ChainMap will
 +# retrieve them from the source node when needed.  Other copiers might copy
 +# them, so we call them __QUICK_TYPES.
 +__QUICK_TYPES = (str, bool,
 +                 yaml.scalarstring.PreservedScalarString,
 +                 yaml.scalarstring.SingleQuotedScalarString,
 +                 yaml.scalarstring.DoubleQuotedScalarString)
++
 +# These types have to be iterated like a dictionary
 +__DICT_TYPES = (dict, ChainMap, yaml.comments.CommentedMap)
++
 +# These types have to be iterated like a list
 +__LIST_TYPES = (list, yaml.comments.CommentedSeq)
++
 +# These are the provenance types, which have to be cloned rather than any other
 +# copying tactic.
 +__PROVENANCE_TYPES = (Provenance, DictProvenance, MemberProvenance, ElementProvenance)
++
 +# These are the directives used to compose lists, we need this because it's
 +# slightly faster during the node_final_assertions checks
 +__NODE_ASSERT_COMPOSITION_DIRECTIVES = ('(>)', '(<)', '(=)')
++
++
  def node_chain_copy(source):
      copy = ChainMap({}, source)
      for key, value in source.items():
 -        if isinstance(value, collections.abc.Mapping):
 +        value_type = type(value)
 +        if value_type in __DICT_TYPES:
              copy[key] = node_chain_copy(value)
 -        elif isinstance(value, list):
 +        elif value_type in __LIST_TYPES:
              copy[key] = list_chain_copy(value)
 -        elif isinstance(value, Provenance):
 +        elif value_type in __PROVENANCE_TYPES:
              copy[key] = value.clone()
 +        elif value_type in __QUICK_TYPES:
 +            pass  # No need to copy these, the chainmap deals with it
 +        else:
 +            raise ValueError("Unable to be quick about node_chain_copy of {}".format(value_type))
      return copy
@@ -1080,14 +1135,17 @@ def node_chain_copy(source):
  def list_chain_copy(source):
      copy = []
      for item in source:
 -        if isinstance(item, collections.abc.Mapping):
 +        item_type = type(item)
 +        if item_type in __DICT_TYPES:
              copy.append(node_chain_copy(item))
 -        elif isinstance(item, list):
 +        elif item_type in __LIST_TYPES:
              copy.append(list_chain_copy(item))
 -        elif isinstance(item, Provenance):
 +        elif item_type in __PROVENANCE_TYPES:
              copy.append(item.clone())
 -        else:
 +        elif item_type in __QUICK_TYPES:
              copy.append(item)
 +        else:  # Fallback
 +            raise ValueError("Unable to be quick about list_chain_copy of {}".format(item_type))
      return copy
@@ -1095,14 +1153,17 @@ def list_chain_copy(source):
  def node_copy(source):
      copy = {}
      for key, value in source.items():
 -        if isinstance(value, collections.abc.Mapping):
 +        value_type = type(value)
 +        if value_type in __DICT_TYPES:
              copy[key] = node_copy(value)
 -        elif isinstance(value, list):
 +        elif value_type in __LIST_TYPES:
              copy[key] = list_copy(value)
 -        elif isinstance(value, Provenance):
 +        elif value_type in __PROVENANCE_TYPES:
              copy[key] = value.clone()
 -        else:
 +        elif value_type in __QUICK_TYPES:
              copy[key] = value
 +        else:
 +            raise ValueError("Unable to be quick about node_copy of {}".format(value_type))
      ensure_provenance(copy)
@@ -1112,14 +1173,17 @@ def node_copy(source):
  def list_copy(source):
      copy = []
      for item in source:
 -        if isinstance(item, collections.abc.Mapping):
 +        item_type = type(item)
 +        if item_type in __DICT_TYPES:
              copy.append(node_copy(item))
 -        elif isinstance(item, list):
 +        elif item_type in __LIST_TYPES:
              copy.append(list_copy(item))
 -        elif isinstance(item, Provenance):
 +        elif item_type in __PROVENANCE_TYPES:
              copy.append(item.clone())
 -        else:
 +        elif item_type in __QUICK_TYPES:
              copy.append(item)
 +        else:
 +            raise ValueError("Unable to be quick about list_copy of {}".format(item_type))
      return copy
@@ -1142,22 +1206,26 @@ def node_final_assertions(node):
          # indicates that the user intended to override a list which
          # never existed in the underlying data
+         #
 -        if key in ['(>)', '(<)', '(=)']:
 +        if key in __NODE_ASSERT_COMPOSITION_DIRECTIVES:
              provenance = node_get_provenance(node, key)
              raise LoadError(LoadErrorReason.TRAILING_LIST_DIRECTIVE,
                              "{}: Attempt to override non-existing list".format(provenance))
 -        if isinstance(value, collections.abc.Mapping):
 +        value_type = type(value)
++
 +        if value_type in __DICT_TYPES:
              node_final_assertions(value)
 -        elif isinstance(value, list):
 +        elif value_type in __LIST_TYPES:
              list_final_assertions(value)
  def list_final_assertions(values):
      for value in values:
 -        if isinstance(value, collections.abc.Mapping):
 +        value_type = type(value)
++
 +        if value_type in __DICT_TYPES:
              node_final_assertions(value)
 -        elif isinstance(value, list):
 +        elif value_type in __LIST_TYPES:
              list_final_assertions(value)

man/bst-artifact-checkout.1

 -.TH "BST ARTIFACT CHECKOUT" "1" "24-Jan-2019" "" "bst artifact checkout Manual"
 +.TH "BST ARTIFACT CHECKOUT" "1" "12-Feb-2019" "" "bst artifact checkout Manual"
  .SH NAME
  bst\-artifact\-checkout \- Checkout contents of an artifact
  .SH SYNOPSIS

man/bst-artifact-log.1

 -.TH "BST ARTIFACT LOG" "1" "24-Jan-2019" "" "bst artifact log Manual"
 +.TH "BST ARTIFACT LOG" "1" "12-Feb-2019" "" "bst artifact log Manual"
  .SH NAME
  bst\-artifact\-log \- Show logs of an artifact
  .SH SYNOPSIS

man/bst-artifact-pull.1

 -.TH "BST ARTIFACT PULL" "1" "24-Jan-2019" "" "bst artifact pull Manual"
 +.TH "BST ARTIFACT PULL" "1" "12-Feb-2019" "" "bst artifact pull Manual"
  .SH NAME
  bst\-artifact\-pull \- Pull a built artifact
  .SH SYNOPSIS

man/bst-artifact-push.1

 -.TH "BST ARTIFACT PUSH" "1" "24-Jan-2019" "" "bst artifact push Manual"
 +.TH "BST ARTIFACT PUSH" "1" "12-Feb-2019" "" "bst artifact push Manual"
  .SH NAME
  bst\-artifact\-push \- Push a built artifact
  .SH SYNOPSIS

man/bst-artifact-server.1

 -.TH "BST-ARTIFACT-SERVER" "1" "24-Jan-2019" "" "bst-artifact-server Manual"
 +.TH "BST-ARTIFACT-SERVER" "1" "12-Feb-2019" "" "bst-artifact-server Manual"
  .SH NAME
  bst-artifact-server \- CAS Artifact Server
  .SH SYNOPSIS

man/bst-artifact.1

 -.TH "BST ARTIFACT" "1" "24-Jan-2019" "" "bst artifact Manual"
 +.TH "BST ARTIFACT" "1" "12-Feb-2019" "" "bst artifact Manual"
  .SH NAME
  bst\-artifact \- Manipulate cached artifacts
  .SH SYNOPSIS

man/bst-build.1

 -.TH "BST BUILD" "1" "24-Jan-2019" "" "bst build Manual"
 +.TH "BST BUILD" "1" "12-Feb-2019" "" "bst build Manual"
  .SH NAME
  bst\-build \- Build elements in a pipeline
  .SH SYNOPSIS
@@ -32,3 +32,6 @@ Allow tracking to cross junction boundaries
  .TP
  \fB\-\-track\-save\fP
  Deprecated: This is ignored
 +.TP
 +\fB\-r,\fP \-\-remote TEXT
 +The URL of the remote cache (defaults to the first configured cache)

man/bst-help.1

 -.TH "BST HELP" "1" "24-Jan-2019" "" "bst help Manual"
 +.TH "BST HELP" "1" "12-Feb-2019" "" "bst help Manual"
  .SH NAME
  bst\-help \- Print usage information
  .SH SYNOPSIS

man/bst-init.1

 -.TH "BST INIT" "1" "24-Jan-2019" "" "bst init Manual"
 +.TH "BST INIT" "1" "12-Feb-2019" "" "bst init Manual"
  .SH NAME
  bst\-init \- Initialize a new BuildStream project
  .SH SYNOPSIS

man/bst-shell.1

 -.TH "BST SHELL" "1" "24-Jan-2019" "" "bst shell Manual"
 +.TH "BST SHELL" "1" "12-Feb-2019" "" "bst shell Manual"
  .SH NAME
  bst\-shell \- Shell into an element's sandbox environment
  .SH SYNOPSIS

man/bst-show.1

 -.TH "BST SHOW" "1" "24-Jan-2019" "" "bst show Manual"
 +.TH "BST SHOW" "1" "12-Feb-2019" "" "bst show Manual"
  .SH NAME
  bst\-show \- Show elements in the pipeline
  .SH SYNOPSIS
@@ -43,6 +43,9 @@ the following symbols can be used in the format string:
      %{public}         Public domain data
      %{workspaced}     If the element is workspaced
      %{workspace-dirs} A list of workspace directories
 +    %{deps}           A list of all dependencies
 +    %{build-deps}     A list of build dependencies
 +    %{runtime-deps}   A list of runtime dependencies
  .PP
  The value of the %{symbol} without the leading '%' character is understood
  as a pythonic formatting string, so python formatting features apply,

man/bst-source-checkout.1

 -.TH "BST SOURCE CHECKOUT" "1" "24-Jan-2019" "" "bst source checkout Manual"
 +.TH "BST SOURCE CHECKOUT" "1" "12-Feb-2019" "" "bst source checkout Manual"
  .SH NAME
  bst\-source\-checkout \- Checkout sources for an element
  .SH SYNOPSIS

man/bst-source-fetch.1

 -.TH "BST SOURCE FETCH" "1" "24-Jan-2019" "" "bst source fetch Manual"
 +.TH "BST SOURCE FETCH" "1" "12-Feb-2019" "" "bst source fetch Manual"
  .SH NAME
  bst\-source\-fetch \- Fetch sources in a pipeline
  .SH SYNOPSIS

man/bst-source-track.1

 -.TH "BST SOURCE TRACK" "1" "24-Jan-2019" "" "bst source track Manual"
 +.TH "BST SOURCE TRACK" "1" "12-Feb-2019" "" "bst source track Manual"
  .SH NAME
  bst\-source\-track \- Track new source references
  .SH SYNOPSIS

man/bst-source.1

 -.TH "BST SOURCE" "1" "24-Jan-2019" "" "bst source Manual"
 +.TH "BST SOURCE" "1" "12-Feb-2019" "" "bst source Manual"
  .SH NAME
  bst\-source \- Manipulate sources for an element
  .SH SYNOPSIS

man/bst-workspace-close.1

 -.TH "BST WORKSPACE CLOSE" "1" "24-Jan-2019" "" "bst workspace close Manual"
 +.TH "BST WORKSPACE CLOSE" "1" "12-Feb-2019" "" "bst workspace close Manual"
  .SH NAME
  bst\-workspace\-close \- Close workspaces
  .SH SYNOPSIS

man/bst-workspace-list.1

 -.TH "BST WORKSPACE LIST" "1" "24-Jan-2019" "" "bst workspace list Manual"
 +.TH "BST WORKSPACE LIST" "1" "12-Feb-2019" "" "bst workspace list Manual"
  .SH NAME
  bst\-workspace\-list \- List open workspaces
  .SH SYNOPSIS

man/bst-workspace-open.1

 -.TH "BST WORKSPACE OPEN" "1" "24-Jan-2019" "" "bst workspace open Manual"
 +.TH "BST WORKSPACE OPEN" "1" "12-Feb-2019" "" "bst workspace open Manual"
  .SH NAME
  bst\-workspace\-open \- Open a new workspace
  .SH SYNOPSIS

man/bst-workspace-reset.1

 -.TH "BST WORKSPACE RESET" "1" "24-Jan-2019" "" "bst workspace reset Manual"
 +.TH "BST WORKSPACE RESET" "1" "12-Feb-2019" "" "bst workspace reset Manual"
  .SH NAME
  bst\-workspace\-reset \- Reset a workspace to its original state
  .SH SYNOPSIS

man/bst-workspace.1

 -.TH "BST WORKSPACE" "1" "24-Jan-2019" "" "bst workspace Manual"
 +.TH "BST WORKSPACE" "1" "12-Feb-2019" "" "bst workspace Manual"
  .SH NAME
  bst\-workspace \- Manipulate developer workspaces
  .SH SYNOPSIS

 -.TH "BST" "1" "24-Jan-2019" "" "bst Manual"
 +.TH "BST" "1" "12-Feb-2019" "" "bst Manual"
  .SH NAME
  bst \- Build and manipulate BuildStream projects...
  .SH SYNOPSIS

tests/frontend/show.py

@@ -400,3 +400,28 @@ def test_exceed_max_recursion_depth(cli, tmpdir, dependency_depth):
          assert result.exit_code == -1
      shutil.rmtree(project_path)
++
++
 +###############################################################
 +#                   Testing format symbols                    #
 +###############################################################
 +@pytest.mark.datafiles(os.path.join(DATA_DIR, 'project'))
 +@pytest.mark.parametrize("dep_kind, expected_deps", [
 +    ('%{deps}', '[import-dev.bst, import-bin.bst]'),
 +    ('%{build-deps}', '[import-dev.bst]'),
 +    ('%{runtime-deps}', '[import-bin.bst]')
 +])
 +def test_format_deps(cli, datafiles, dep_kind, expected_deps):
 +    project = os.path.join(datafiles.dirname, datafiles.basename)
 +    target = 'checkout-deps.bst'
 +    result = cli.run(project=project, silent=True, args=[
 +        'show',
 +        '--deps', 'none',
 +        '--format', '%{name}: ' + dep_kind,
 +        target])
 +    result.assert_success()
++
 +    expected = '{name}: {deps}'.format(name=target, deps=expected_deps)
 +    if result.output.strip() != expected:
 +        raise AssertionError("Expected output:\n{}\nInstead received output:\n{}"
 +                             .format(expected, result.output))

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]