TST: Fix tight layout tests without text

If we pass `remove_text` to `image_comparison`, we don't expect tests to
change from FreeType. But if `tight_layout` is called *before* the end
of the test function, the layout will happen with the text that was
supposed to be removed.

Author: QuLogic

lib/matplotlib/tests/baseline_images/test_table/table_cell_manipulation.png

@@ -87,13 +87,13 @@ def test_label_colours():
               loc='best')
 
 
-@image_comparison(['table_cell_manipulation.png'], remove_text=True)
-def test_diff_cell_table():
+@image_comparison(['table_cell_manipulation.png'], style='mpl20')
+def test_diff_cell_table(text_placeholders):
     cells = ('horizontal', 'vertical', 'open', 'closed', 'T', 'R', 'B', 'L')
     cellText = [['1'] * len(cells)] * 2
     colWidths = [0.1] * len(cells)
 
-    _, axs = plt.subplots(nrows=len(cells), figsize=(4, len(cells)+1))
+    _, axs = plt.subplots(nrows=len(cells), figsize=(4, len(cells)+1), layout='tight')
     for ax, cell in zip(axs, cells):
         ax.table(
                 colWidths=colWidths,
@@ -102,7 +102,6 @@ def test_diff_cell_table():
                 edges=cell,
                 )
         ax.axis('off')
-    plt.tight_layout()
 
 
 def test_customcell():

lib/matplotlib/tests/test_table.py

@@ -119,7 +119,7 @@ def test_axisline_style_size_color():
 @image_comparison(['axisline_style_tight.png'], remove_text=True,
                   style='mpl20')
 def test_axisline_style_tight():
-    fig = plt.figure(figsize=(2, 2))
+    fig = plt.figure(figsize=(2, 2), layout='tight')
     ax = fig.add_subplot(axes_class=AxesZero)
     ax.axis["xzero"].set_axisline_style("-|>", size=5, facecolor='g')
     ax.axis["xzero"].set_visible(True)
@@ -129,8 +129,6 @@ def test_axisline_style_tight():
     for direction in ("left", "right", "bottom", "top"):
         ax.axis[direction].set_visible(False)
 
-    fig.tight_layout()
-
 
 @image_comparison(['subplotzero_ylabel.png'], style='mpl20')
 def test_subplotzero_ylabel():