[Notes] [Git][BuildStream/buildstream][mac_fixes] 4 commits: utils.py: r

Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream

Commits:

c5dd2cb6

by knownexus at 2018-09-25T15:10:29Z

utils.py: reworked safe_remove

non-Linux platforms don't return EISDIR when attempting to unlink a directory

Stopped safe_remove attempting to unlink dirs
Previously safe_remove would attempt to unlink a path
Before attempting to remove it if it was a dir

Now it checks for a dir before that step

54e27fb3

by James Ennis at 2018-09-25T15:10:33Z

Sandbox: Ensure that we only import the sandbox subclasses when instantiate a sandbox

  - This patch was required due to not being able to execute `bst` on
  a Linux machine without Fuse or Bubblewrap available

3d1595e1

by James Ennis at 2018-09-25T15:10:33Z

_platform/linux.py: Ensure exception is not raised when performing sandbox availability check

c6731a29

by Phillip Smyth at 2018-09-25T15:10:33Z

Fixed workspace list error message

If no workspaces were found, bst workspace would return `[]`
This has been changed to a nicer message

7 changed files:

buildstream/_platform/darwin.py
buildstream/_platform/linux.py
buildstream/_platform/unix.py
buildstream/_stream.py
buildstream/sandbox/__init__.py
buildstream/utils.py
tests/frontend/cross_junction_workspace.py

Changes:

buildstream/_platform/darwin.py

@@ -19,7 +19,7 @@ import os
  import resource
  from .._exceptions import PlatformError
 -from ..sandbox import SandboxChroot, SandboxDummy
 +from ..sandbox import SandboxDummy
  from . import Platform

buildstream/_platform/linux.py

@@ -24,7 +24,7 @@ from .. import _site
  from .. import utils
  from .._artifactcache.cascache import CASCache
  from .._message import Message, MessageType
 -from ..sandbox import SandboxBwrap, SandboxDummy
 +from ..sandbox import SandboxDummy
  from . import Platform
@@ -52,6 +52,7 @@ class Linux(Platform):
          if not self._local_sandbox_available():
              return SandboxDummy(*args, **kwargs)
          else:
 +            from ..sandbox._sandboxbwrap import SandboxBwrap
              # Inform the bubblewrap sandbox as to whether it can use user namespaces or not
              kwargs['user_ns_available'] = self._user_ns_available
              kwargs['die_with_parent_available'] = self._die_with_parent_available
@@ -64,7 +65,10 @@ class Linux(Platform):
      #              Private Methods                 #
      ################################################
      def _local_sandbox_available(self):
 -        return os.path.exists(utils.get_host_tool('bwrap')) and os.path.exists('/dev/fuse')
 +        try:
 +            return os.path.exists(utils.get_host_tool('bwrap')) and os.path.exists('/dev/fuse')
 +        except utils.ProgramNotFoundError:
 +            return False
      def _check_user_ns_available(self, context):
          # Here, lets check if bwrap is able to create user namespaces,

buildstream/_platform/unix.py

@@ -21,7 +21,6 @@ import os
  from .._artifactcache.cascache import CASCache
  from .._exceptions import PlatformError
 -from ..sandbox import SandboxChroot
  from . import Platform
@@ -41,4 +40,5 @@ class Unix(Platform):
          return self._artifact_cache
      def create_sandbox(self, *args, **kwargs):
 +        from ..sandbox._sandboxchroot import SandboxChroot
          return SandboxChroot(*args, **kwargs)

buildstream/_stream.py

@@ -641,6 +641,9 @@ class Stream():
+             }
              workspaces.append(workspace_detail)
 +        if not workspaces:
 +            workspaces = "No workspaces found"
++
          _yaml.dump({
              'workspaces': workspaces
          })

buildstream/sandbox/__init__.py

@@ -18,7 +18,5 @@
  #        Tristan Maat <tristan maat codethink co uk>
  from .sandbox import Sandbox, SandboxFlags
 -from ._sandboxchroot import SandboxChroot
 -from ._sandboxbwrap import SandboxBwrap
  from ._sandboxremote import SandboxRemote
  from ._sandboxdummy import SandboxDummy

buildstream/utils.py

@@ -35,6 +35,7 @@ import tempfile
  import itertools
  import functools
  from contextlib import contextmanager
 +from stat import S_ISDIR
  import psutil
@@ -328,27 +329,25 @@ def safe_remove(path):
      Raises:
         UtilError: In the case of unexpected system call failures
      """
 -    if os.path.lexists(path):
+-
 -        # Try to remove anything that is in the way, but issue
 -        # a warning instead if it removes a non empty directory
 -        try:
 +    try:
 +        if S_ISDIR(os.lstat(path).st_mode):
 +            os.rmdir(path)
 +        else:
              os.unlink(path)
 -        except OSError as e:
 -            if e.errno != errno.EISDIR:
 -                raise UtilError("Failed to remove '{}': {}"
 -                                .format(path, e))
+-
 -            try:
 -                os.rmdir(path)
 -            except OSError as e:
 -                if e.errno == errno.ENOTEMPTY:
 -                    return False
 -                else:
 -                    raise UtilError("Failed to remove '{}': {}"
 -                                    .format(path, e))
 -    return True
 +        # File removed/unlinked successfully
 +        return True
++
 +    except OSError as e:
 +        if e.errno == errno.ENOTEMPTY:
 +            # Path is non-empty directory
 +            return False
 +        elif e.errno == errno.ENOENT:
 +            # Path does not exist
 +            return True
++
 +        raise UtilError("Failed to remove '{}': {}"
 +                        .format(path, e))
  def copy_files(src, dest, *, files=None, ignore_missing=False, report_written=False):

tests/frontend/cross_junction_workspace.py

@@ -93,9 +93,10 @@ def test_close_cross_junction(cli, tmpdir):
      result.assert_success()
      loaded = _yaml.load_data(result.output)
 -    assert isinstance(loaded.get('workspaces'), list)
 -    workspaces = loaded['workspaces']
 -    assert len(workspaces) == 0
 +    if not loaded['workspaces'] == "No workspaces found":
 +        assert isinstance(loaded.get('workspaces'), list)
 +        workspaces = loaded['workspaces']
 +        assert len(workspaces) == 0
  def test_close_all_cross_junction(cli, tmpdir):
@@ -112,6 +113,7 @@ def test_close_all_cross_junction(cli, tmpdir):
      result.assert_success()
      loaded = _yaml.load_data(result.output)
 -    assert isinstance(loaded.get('workspaces'), list)
 -    workspaces = loaded['workspaces']
 -    assert len(workspaces) == 0
 +    if not loaded['workspaces'] == "No workspaces found":
 +        assert isinstance(loaded.get('workspaces'), list)
 +        workspaces = loaded['workspaces']
 +        assert len(workspaces) == 0

[Notes] [Git][BuildStream/buildstream][mac_fixes] 4 commits: utils.py: reworked safe_remove

Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream

Commits:

7 changed files:

Changes: