Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Touch up tests #687

Merged
merged 2 commits into from
Dec 1, 2017
+31 −11
Merged

Touch up tests #687

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
116abc9
touch up existing test code
jurko-gospodnetic Nov 28, 2017
5efadf5
test how environments are recognized based on factors
jurko-gospodnetic Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def test_config_parse_platform_rex(self, newconfig, mocksession, monkeypatch):
monkeypatch.undo()
assert not venv.matching_platform()

@pytest.mark.parametrize("plat", ["win", "lin", ])
@pytest.mark.parametrize("plat", ["win", "lin", "osx"])
def test_config_parse_platform_with_factors(self, newconfig, plat, monkeypatch):
monkeypatch.setattr(sys, "platform", "win32")
config = newconfig([], """
Expand All @@ -185,7 +185,7 @@ def test_config_parse_platform_with_factors(self, newconfig, plat, monkeypatch):
""")
assert len(config.envconfigs) == 3
platform = config.envconfigs['py27-' + plat].platform
expected = {"win": "win32", "lin": "linux2"}.get(plat)
expected = {"win": "win32", "lin": "linux2", "osx": ""}.get(plat)
assert platform == expected


Expand Down Expand Up @@ -526,8 +526,6 @@ def test_argvlist(self, tmpdir, newconfig):
""")
reader = SectionReader("section", config._cfg)
reader.addsubstitutions(item1="with space", item2="grr")
# pytest.raises(tox.exception.ConfigError,
# "reader.getargvlist('key1')")
assert reader.getargvlist('key1') == []
x = reader.getargvlist("key2")
assert x == [["cmd1", "with", "space", "grr"],
Expand All @@ -552,8 +550,6 @@ def test_argvlist_multiline(self, tmpdir, newconfig):
""")
reader = SectionReader("section", config._cfg)
reader.addsubstitutions(item1="with space", item2="grr")
# pytest.raises(tox.exception.ConfigError,
# "reader.getargvlist('key1')")
assert reader.getargvlist('key1') == []
x = reader.getargvlist("key2")
assert x == [["cmd1", "with", "space", "grr"]]
Expand Down Expand Up @@ -600,17 +596,13 @@ def test_argvlist_positional_substitution(self, tmpdir, newconfig):
reader = SectionReader("section", config._cfg)
posargs = ['hello', 'world']
reader.addsubstitutions(posargs, item2="value2")
# pytest.raises(tox.exception.ConfigError,
# "reader.getargvlist('key1')")
assert reader.getargvlist('key1') == []
argvlist = reader.getargvlist("key2")
assert argvlist[0] == ["cmd1"] + posargs
assert argvlist[1] == ["cmd2"] + posargs

reader = SectionReader("section", config._cfg)
reader.addsubstitutions([], item2="value2")
# pytest.raises(tox.exception.ConfigError,
# "reader.getargvlist('key1')")
assert reader.getargvlist('key1') == []
argvlist = reader.getargvlist("key2")
assert argvlist[0] == ["cmd1"]
Expand Down Expand Up @@ -1411,6 +1403,33 @@ def get_deps(env):
assert get_deps("b-x") == ["dep-a-or-b"]
assert get_deps("b-y") == ["dep-a-or-b", "dep-ab-and-y"]

def test_envconfigs_based_on_factors(self, newconfig):
inisource = """
[testenv]
some-setting=
a: something
b,c: something
d-e: something

[unknown-section]
some-setting=
eggs: something
"""
config = newconfig(["-e spam"], inisource)
assert not config.envconfigs
assert config.envlist == ["spam"]
config = newconfig(["-e eggs"], inisource)
assert not config.envconfigs
assert config.envlist == ["eggs"]
config = newconfig(["-e py3-spam"], inisource)
assert not config.envconfigs
assert config.envlist == ["py3-spam"]
for x in "abcde":
env = "py3-{}".format(x)
config = newconfig(["-e {}".format(env)], inisource)
assert sorted(config.envconfigs) == [env]
assert config.envlist == [env]

def test_default_factors(self, newconfig):
inisource = """
[tox]
Expand Down Expand Up @@ -1576,6 +1595,8 @@ def test_env_selection(self, tmpdir, newconfig, monkeypatch):
assert config.envlist == ['py27', 'py35', 'py36']
config = newconfig(["-eALL"], inisource)
assert config.envlist == ['py27', 'py35', 'py36']
config = newconfig(['-espam'], inisource)
assert config.envlist == ["spam"]

def test_py_venv(self, tmpdir, newconfig, monkeypatch):
config = newconfig(["-epy"], "")
Expand Down Expand Up @@ -2308,7 +2329,6 @@ class TestCommandParser:

def test_command_parser_for_word(self):
p = CommandParser('word')
# import pytest; pytest.set_trace()
assert list(p.words()) == ['word']

def test_command_parser_for_posargs(self):
Expand Down