diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-09-16 14:10:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-09-16 14:10:52 +0000 |
| commit | dd16f3f0e8c43a53c847cada3a6762fa3bc6f3e5 (patch) | |
| tree | 5206eca8bd60016feeda38ba7a1fb8f21cdc23f5 /tests/test_terminal_io | |
| parent | Releasing debian version 3.1.0-5. (diff) | |
| download | terminaltables-dd16f3f0e8c43a53c847cada3a6762fa3bc6f3e5.tar.xz terminaltables-dd16f3f0e8c43a53c847cada3a6762fa3bc6f3e5.zip | |
Merging upstream version 3.1.10 (Closes: #1014035).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/test_terminal_io')
| -rw-r--r-- | tests/test_terminal_io/sub_title_ascii_win2012b.bmp | bin | 0 -> 4142 bytes | |||
| -rw-r--r-- | tests/test_terminal_io/sub_title_cjk_win2012b.bmp | bin | 0 -> 9258 bytes | |||
| -rw-r--r-- | tests/test_terminal_io/test_set_terminal_title.py | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_terminal_io/sub_title_ascii_win2012b.bmp b/tests/test_terminal_io/sub_title_ascii_win2012b.bmp Binary files differnew file mode 100644 index 0000000..5c7a484 --- /dev/null +++ b/tests/test_terminal_io/sub_title_ascii_win2012b.bmp diff --git a/tests/test_terminal_io/sub_title_cjk_win2012b.bmp b/tests/test_terminal_io/sub_title_cjk_win2012b.bmp Binary files differnew file mode 100644 index 0000000..0606a82 --- /dev/null +++ b/tests/test_terminal_io/sub_title_cjk_win2012b.bmp diff --git a/tests/test_terminal_io/test_set_terminal_title.py b/tests/test_terminal_io/test_set_terminal_title.py index 6d58301..38980be 100644 --- a/tests/test_terminal_io/test_set_terminal_title.py +++ b/tests/test_terminal_io/test_set_terminal_title.py @@ -15,7 +15,7 @@ from tests.test_terminal_io import MockKernel32 HERE = py.path.local(__file__).dirpath() - +@pytest.mark.skip("Fails on windows, I didn't touch it") @pytest.mark.parametrize('is_windows', [False, True]) @pytest.mark.parametrize('mode', ['ascii', 'unicode', 'bytes']) def test(monkeypatch, is_windows, mode): @@ -54,8 +54,8 @@ def test(monkeypatch, is_windows, mode): @pytest.mark.skipif(str(not IS_WINDOWS)) -@pytest.mark.skipif('True') # https://github.com/Robpol86/terminaltables/issues/30 @pytest.mark.parametrize('mode', ['ascii', 'unicode', 'bytes']) +@pytest.mark.skip # https://github.com/Robpol86/terminaltables/issues/44 def test_windows_screenshot(tmpdir, mode): """Test function on Windows in a new console window. Take a screenshot to verify it works. @@ -65,7 +65,7 @@ def test_windows_screenshot(tmpdir, mode): script = tmpdir.join('script.py') command = [sys.executable, str(script)] change_title = tmpdir.join('change_title') - screenshot = PROJECT_ROOT.join('test_terminal_io.png') + screenshot = PROJECT_ROOT.join('test_terminal_io_{0}.png'.format(mode)) if screenshot.check(): screenshot.remove() |
