hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug in placeholder spack cd command and add unit tests (#6776)

Browse source
This commit is contained in:
Adam J. Stewart 2018-01-10 10:03:45 -06:00 committed by GitHub
parent db42d080f7
commit cab34d7d3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/spack/spack/cmd/cd.py
View file

@ -22,8 +22,9 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack.cmd.common import print_module_placeholder_help
import spack.cmd.location import spack.cmd.location
import spack.modules
description = "cd to spack directories in the shell" description = "cd to spack directories in the shell"
section = "environment" section = "environment"
@ -38,4 +39,4 @@ def setup_parser(subparser):
def cd(parser, args): def cd(parser, args):
spack.modules.print_help() print_module_placeholder_help()

2
lib/spack/spack/main.py
View file

@ -388,7 +388,7 @@ def __call__(self, *argv, **kwargs):
Returns: Returns:
(str): combined output and error as a string (str): combined output and error as a string
On return, if ``fail_on_error`` is False, return value of comman On return, if ``fail_on_error`` is False, return value of command
is set in ``returncode`` property, and the error is set in the is set in ``returncode`` property, and the error is set in the
``error`` property. Otherwise, raise an error. ``error`` property. Otherwise, raise an error.
""" """

36
lib/spack/spack/test/cmd/cd.py Normal file
View file

@ -0,0 +1,36 @@
##############################################################################
# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
#
# This file is part of Spack.
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
# LLNL-CODE-647188
#
# For details, see https://github.com/spack/spack
# Please also see the NOTICE and LICENSE files for our notice and the LGPL.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License (as
# published by the Free Software Foundation) version 2.1, February 1999.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
# conditions of the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack.main import SpackCommand
cd = SpackCommand('cd')
def test_cd():
"""Sanity check the cd command to make sure it works."""
out = cd()
assert "To initialize spack's shell commands, you must run one of" in out