Merging upstream version 3.1.10 (Closes: #1014035).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 6 insertions, 6 deletions

diff --git a/tests/test_all_tables_e2e/test_ascii_table.py b/tests/test_all_tables_e2e/test_ascii_table.py
index 51ebc2a..a1a3b9c 100644
--- a/tests/test_all_tables_e2e/test_ascii_table.py
+++ b/tests/test_all_tables_e2e/test_ascii_table.py
@@ -100,7 +100,7 @@ def test_multi_line():
 
 
 @pytest.mark.skipif(str(not IS_WINDOWS))
-@pytest.mark.skipif('True')  # https://github.com/Robpol86/terminaltables/issues/30
+@pytest.mark.skip  # https://github.com/Robpol86/terminaltables/issues/44
 def test_windows_screenshot(tmpdir):
     """Test on Windows in a new console window. Take a screenshot to verify it works.
 
diff --git a/tests/test_all_tables_e2e/test_double_table.py b/tests/test_all_tables_e2e/test_double_table.py
index 892357a..beec764 100644
--- a/tests/test_all_tables_e2e/test_double_table.py
+++ b/tests/test_all_tables_e2e/test_double_table.py
@@ -200,7 +200,7 @@ def test_multi_line():
 
 
 @pytest.mark.skipif(str(not IS_WINDOWS))
-@pytest.mark.skipif('True')  # https://github.com/Robpol86/terminaltables/issues/30
+@pytest.mark.skip  # https://github.com/Robpol86/terminaltables/issues/44
 def test_windows_screenshot(tmpdir):
     """Test on Windows in a new console window. Take a screenshot to verify it works.
 
diff --git a/tests/test_all_tables_e2e/test_single_table_windows.py b/tests/test_all_tables_e2e/test_single_table_windows.py
index a15fa3a..bfdfe2e 100644
--- a/tests/test_all_tables_e2e/test_single_table_windows.py
+++ b/tests/test_all_tables_e2e/test_single_table_windows.py
@@ -201,7 +201,7 @@ def test_multi_line():
 
 
 @pytest.mark.skipif(str(not IS_WINDOWS))
-@pytest.mark.skipif('True')  # https://github.com/Robpol86/terminaltables/issues/30
+@pytest.mark.skip  # https://github.com/Robpol86/terminaltables/issues/44
 def test_windows_screenshot(tmpdir):
     """Test on Windows in a new console window. Take a screenshot to verify it works.
 
diff --git a/tests/test_terminal_io/sub_title_ascii_win2012b.bmp b/tests/test_terminal_io/sub_title_ascii_win2012b.bmp
new 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
new 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()