Skip to content

Commit

Permalink
Merge pull request #7461 from fcollonval/fix-7456
Browse files Browse the repository at this point in the history
Fix #7456
  • Loading branch information
jasongrout committed Nov 2, 2019
2 parents c27318d + 5b36fb5 commit 172e664
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
7 changes: 6 additions & 1 deletion jupyterlab/commands.py
Expand Up @@ -1762,8 +1762,13 @@ def _yarn_config(logger):
-------
{"yarn config": dict, "npm config": dict} if unsuccessfull the subdictionary are empty
"""
node = which('node')
configuration = {"yarn config": {}, "npm config": {}}
try:
node = which('node')
except ValueError: # Node not found == user with no need for building jupyterlab
logger.debug("NodeJS was not found. Yarn user configuration is ignored.")
return configuration

try:
output_binary = subprocess.check_output([node, YARN_PATH, 'config', 'list', '--json'], stderr=subprocess.PIPE, cwd=HERE)
output = output_binary.decode('utf-8')
Expand Down
15 changes: 15 additions & 0 deletions jupyterlab/tests/test_registry.py
Expand Up @@ -19,6 +19,21 @@

class TestAppHandlerRegistry(AppHandlerTest):

def test_node_not_available(self):
# patch should be applied on `jupyterlab.commands` and not on `jupyterlab_server.process`
# See https://docs.python.org/3/library/unittest.mock.html#where-to-patch
with patch("jupyterlab.commands.which") as which:
which.side_effect = ValueError("Command not found")

logger = logging.getLogger('jupyterlab')
config = commands._yarn_config(logger)

which.assert_called_once_with('node')
self.assertDictEqual(config,
{"yarn config": {},
"npm config": {}}
)

def test_yarn_config(self):
with patch("subprocess.check_output") as check_output:
yarn_registry = "https://private.yarn/manager"
Expand Down

0 comments on commit 172e664

Please sign in to comment.