Hide known warnings from tests.

HexDecimal · HexDecimal · commit c18a3fdc002e · 2018-10-24T22:32:43.000-07:00
diff --git a/tcod/console.py b/tcod/console.py
@@ -376,6 +376,7 @@ def blit(self, dest, dest_x=0, dest_y=0,
             warnings.warn(
                 "Parameter names have been moved around, see documentation.",
                 DeprecationWarning,
+                stacklevel=2,
                 )
 
         if key_color or self._key_color:
diff --git a/tests/test_libtcodpy.py b/tests/test_libtcodpy.py
@@ -26,26 +26,29 @@ def assert_char(console, x, y, ch=None, fg=None, bg=None):
             ch = ord(ch)
         except TypeError:
             pass
-        assert libtcodpy.console_get_char(console, x, y) == ch
+        assert console.ch[y, x] == ch
     if fg is not None:
-        assert libtcodpy.console_get_char_foreground(console, x, y) == fg
+        assert (console.fg[y, x] == fg).all()
     if bg is not None:
-        assert libtcodpy.console_get_char_background(console, x, y) == bg
+        assert (console.bg[y, x] == bg).all()
 
 def test_console_defaults(console, fg, bg):
     libtcodpy.console_set_default_foreground(console, fg)
     libtcodpy.console_set_default_background(console, bg)
     libtcodpy.console_clear(console)
     assert_char(console, 0, 0, None, fg, bg)
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_set_char_background(console, bg):
     libtcodpy.console_set_char_background(console, 0, 0, bg, libtcodpy.BKGND_SET)
     assert_char(console, 0, 0, bg=bg)
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_set_char_foreground(console, fg):
     libtcodpy.console_set_char_foreground(console, 0, 0, fg)
     assert_char(console, 0, 0, fg=fg)
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_set_char(console, ch):
     libtcodpy.console_set_char(console, 0, 0, ch)
     assert_char(console, 0, 0, ch=ch)
@@ -100,15 +103,12 @@ def test_console_fade(console):
     libtcodpy.console_get_fade()
     libtcodpy.console_get_fading_color()
 
+
 def assertConsolesEqual(a, b):
-    for y in range(libtcodpy.console_get_height(a)):
-        for x in range(libtcodpy.console_get_width(a)):
-            assert libtcodpy.console_get_char(a, x, y) == \
-                libtcodpy.console_get_char(b, x, y)
-            assert libtcodpy.console_get_char_foreground(a, x, y) == \
-                libtcodpy.console_get_char_foreground(b, x, y)
-            assert libtcodpy.console_get_char_background(a, x, y) == \
-                libtcodpy.console_get_char_background(b, x, y)
+    return ((a.fg[:] == b.fg[:]).all() and
+            (a.bg[:] == b.bg[:]).all() and
+            (a.ch[:] == b.ch[:]).all())
+
 
 def test_console_blit(console, offscreen):
     libtcodpy.console_print(offscreen, 0, 0, 'test')
@@ -132,6 +132,7 @@ def test_console_apf_read_write(console, offscreen, tmpdir):
     assert libtcodpy.console_load_apf(offscreen, apf_file)
     assertConsolesEqual(console, offscreen)
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_rexpaint_load_test_file(console):
     xp_console = libtcodpy.console_from_xp('libtcod/data/rexpaint/test.xp')
     assert xp_console
@@ -180,6 +181,7 @@ def test_console_fill_errors(console):
     with pytest.raises(TypeError):
         libtcodpy.console_fill_foreground(console, [0], [], [])
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_fill(console):
     width = libtcodpy.console_get_width(console)
     height = libtcodpy.console_get_height(console)
@@ -200,6 +202,7 @@ def test_console_fill(console):
     assert fill == ch
 
 @pytest.mark.skipif(not numpy, reason='requires numpy module')
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_console_fill_numpy(console):
     width = libtcodpy.console_get_width(console)
     height = libtcodpy.console_get_height(console)
@@ -225,6 +228,7 @@ def test_console_fill_numpy(console):
     assert fill == fg.tolist()
     assert fill == ch.tolist()
 
+@pytest.mark.filterwarnings("ignore:Console array attributes perform better")
 def test_console_buffer(console):
     buffer = libtcodpy.ConsoleBuffer(
         libtcodpy.console_get_width(console),
@@ -236,6 +240,7 @@ def test_console_buffer(console):
     buffer.set(0, 0, 0, 0, 0, 0, 0, 0, '@')
     buffer.blit(console)
 
+@pytest.mark.filterwarnings("ignore:Console array attributes perform better")
 def test_console_buffer_error(console):
     buffer = libtcodpy.ConsoleBuffer(0, 0)
     with pytest.raises(ValueError):
@@ -253,6 +258,7 @@ def test_mouse(console):
     repr(mouse)
     libtcodpy.mouse_move(0, 0)
 
+@pytest.mark.filterwarnings("ignore:Use Python's standard 'time' module")
 def test_sys_time(console):
     libtcodpy.sys_set_fps(0)
     libtcodpy.sys_get_fps()
@@ -307,6 +313,7 @@ def test_image(console, tmpdir):
 
 @pytest.mark.parametrize('sample', ['@', u'\u2603']) # Unicode snowman
 @pytest.mark.xfail(reason='Unreliable')
+@pytest.mark.filterwarnings("ignore:This function does not provide reliable")
 def test_clipboard(console, sample):
     saved = libtcodpy.sys_clipboard_get()
     try:
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -2,8 +2,11 @@
 
 import os
 
+import pytest
+
 import tcod as libtcod
 
+@pytest.mark.filterwarnings("ignore:Using this class is not recommended.")
 def test_parser():
     print ('***** File Parser test *****')
     parser=libtcod.parser_new()
diff --git a/tests/test_tcod.py b/tests/test_tcod.py
@@ -51,6 +51,7 @@ def test_tcod_bsp():
     str(bsp)
 
 
+@pytest.mark.filterwarnings("ignore:Directly access a consoles")
 def test_array_read_write(console):
     FG = (255, 254, 253)
     BG = (1, 2, 3)
@@ -93,7 +94,7 @@ def test_console_defaults(console):
     console.default_alignment = tcod.RIGHT
     assert console.default_alignment == tcod.RIGHT
 
-
+@pytest.mark.filterwarnings("ignore:Parameter names have been moved around,")
 def test_console_methods(console):
     console.put_char(0, 0, ord('@'))
     console.print_(0, 0, 'Test')
diff --git a/tests/test_tdl_map.py b/tests/test_tdl_map.py
@@ -2,6 +2,7 @@
 
 import unittest
 import itertools
+import pytest
 
 import tdl
 
@@ -47,14 +48,14 @@ def setUp(self):
             for x, ch in enumerate(line):
                 trans = ch == ' '
                 self.map.transparent[x,y] = self.map.walkable[x,y] = trans
-                self.assertEquals(self.map.transparent[x,y], trans)
-                self.assertEquals(self.map.walkable[x,y], trans)
+                assert self.map.transparent[x,y] == trans
+                assert self.map.walkable[x,y] == trans
 
     def test_map_compute_fov(self):
         fov = self.map.compute_fov(*self.POINT_A)
-        self.assertTrue(list(fov), 'should be non-empty')
+        assert list(fov), 'should be non-empty'
         fov = self.map.compute_fov(*self.POINT_A, fov='PERMISSIVE8')
-        self.assertTrue(list(fov), 'should be non-empty')
+        assert list(fov), 'should be non-empty'
         with self.assertRaises(tdl.TDLError):
             self.map.compute_fov(*self.POINT_A, fov='invalid option')
 
@@ -69,6 +70,7 @@ def test_map_specials(self):
             self.assertTrue((x, y) in self.map)
         self.assertFalse((-1, -1) in self.map)
 
+    @pytest.mark.filterwarnings("ignore:This function is very slow.")
     def test_quick_fov(self):
         fov = tdl.map.quick_fov(self.POINT_B[0], self.POINT_B[1],
                                 self.map_is_transparant, radius=2.5)

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ def blit(self, dest, dest_x=0, dest_y=0,`
`376`	`376`	`warnings.warn(`
`377`	`377`	`"Parameter names have been moved around, see documentation.",`
`378`	`378`	`DeprecationWarning,`
	`379`	`+ stacklevel=2,`
`379`	`380`	`)`
`380`	`381`
`381`	`382`	`if key_color or self._key_color:`