diff options
author | Florian Bruhin <git@the-compiler.org> | 2015-06-18 23:15:08 +0200 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2015-06-19 09:40:26 +0200 |
commit | 85f6b3c6df922d59e5e59bea5fc43465cc9d00a7 (patch) | |
tree | c7c0d84e20688a480b6821812e6bd29bd145175c | |
parent | 08c8a5f7dd1c742e535a170942630140bf83ee39 (diff) | |
download | qutebrowser-85f6b3c6df922d59e5e59bea5fc43465cc9d00a7.tar.gz qutebrowser-85f6b3c6df922d59e5e59bea5fc43465cc9d00a7.zip |
Fix TestGitStr when frozen.
-rw-r--r-- | tests/utils/test_version.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/utils/test_version.py b/tests/utils/test_version.py index 7978c06a7..c2fe19e83 100644 --- a/tests/utils/test_version.py +++ b/tests/utils/test_version.py @@ -111,11 +111,20 @@ class TestGitStr: commit_file_mock.side_effect = OSError assert version._git_str() is None + @pytest.mark.skipif(getattr(sys, 'frozen', False), + reason="Can't be executed when frozen!") def test_normal_successful(self, git_str_subprocess_fake): """Test with git returning a successful result.""" git_str_subprocess_fake.retval = 'c0ffeebabe' assert version._git_str() == 'c0ffeebabe' + @pytest.mark.skipif(not getattr(sys, 'frozen', False), + reason="Can only executed when frozen!") + def test_normal_successful_frozen(self, git_str_subprocess_fake): + """Test with git returning a successful result.""" + # The value is defined in scripts/freeze_tests.py. + assert version._git_str() == 'fake-frozen-git-commit' + def test_normal_error(self, commit_file_mock, git_str_subprocess_fake): """Test without repo (but git-commit-id).""" git_str_subprocess_fake.retval = None @@ -130,6 +139,8 @@ class TestGitStr: side_effect=OSError) assert version._git_str() is None + @pytest.mark.skipif(getattr(sys, 'frozen', False), + reason="Can't be executed when frozen!") def test_normal_path_nofile(self, monkeypatch, caplog, git_str_subprocess_fake, commit_file_mock): """Test with undefined __file__ but available git-commit-id.""" |