# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
+import subprocess
+import warnings
# expand strings from %ENV
def expand_environment_strings(s, vars):
return s
-
+def expand_command_list(cmd):
+ if not "$LISTOPT" in cmd:
+ return None
+ return cmd.replace("$LISTOPT", "--list")
subunithelper,
testlist,
)
-from selftest.run import expand_environment_strings
+from selftest.run import (
+ expand_environment_strings,
+ expand_command_list,
+ )
from selftest.target import (
EnvironmentManager,
NoneTarget,
env_manager.teardown_env(testenv_name)
elif opts.list:
for (name, envname, cmd, supports_loadfile, supports_idlist, subtests) in todo:
- if not "$LISTOPT" in cmd:
+ cmd = expand_command_list(cmd)
+ if cmd is None:
warnings.warn("Unable to list tests in %s" % name)
continue
- cmd = cmd.replace("$LISTOPT", "--list")
-
exitcode = subprocess.call(cmd, shell=True)
if exitcode != 0:
"""Tests for selftest.run."""
-from selftest.run import expand_environment_strings
+from selftest.run import (
+ expand_command_list,
+ expand_environment_strings,
+ )
from selftest.tests import TestCase
def test_unknown(self):
self.assertEquals("foo $BLA",
expand_environment_strings("foo $BLA", {}))
+
+
+class ExpandCommandListTests(TestCase):
+
+ def test_no_list(self):
+ self.assertIs(None, expand_command_list("test bla"))
+
+ def test_list(self):
+ self.assertEquals("test --list", expand_command_list("test $LISTOPT"))