Description: Move away from deprecated pytest features.
Author: Andrius Merkys <merkys@debian.org>
--- a/ase/test/optimize/test_optimizers.py
+++ b/ase/test/optimize/test_optimizers.py
@@ -74,5 +74,3 @@
 
     assert final_fmax < fmax
     assert e_err < 1.75e-5  # (This tolerance is arbitrary)
-
-    return final_fmax, e_err
--- a/ase/test/vibrations/test_vib.py
+++ b/ase/test/vibrations/test_vib.py
@@ -14,7 +14,7 @@
 class TestHarmonicVibrations:
     """Test the ase.vibrations.Vibrations object using a harmonic calculator
     """
-    def setup(self):
+    def setup_method(self):
         self.logfile = 'vibrations-log.txt'
 
     @pytest.fixture
@@ -324,7 +324,7 @@
     def n2_vibdata(self, n2_data):
         return VibrationsData(n2_data['atoms'], n2_data['hessian'])
 
-    def setup(self):
+    def setup_method(self):
         self.jmol_file = 'vib-data.xyz'
 
     def test_init(self, n2_data):