X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/blobdiff_plain/87221e4160e484a01d53d66e59db4c57c2904495..04e4888eb48c30d8c698f47852baef33f9819751:/library/tests/test_noise.py?ds=sidebyside

diff --git a/library/tests/test_noise.py b/library/tests/test_noise.py
index c93f8cc..3778c16 100644
--- a/library/tests/test_noise.py
+++ b/library/tests/test_noise.py
@@ -1,32 +1,7 @@
-import sys
-import mock
 import pytest
 
 
-def force_reimport(module):
-    """Force the module under test to be re-imported.
-
-    Because pytest runs all tests within the same scope (this makes me cry)
-    we have to do some manual housekeeping to avoid tests polluting each other.
-
-    Since conftest.py already does some sys.modules mangling I see no reason not to
-    do the same thing here.
-    """
-    if "." in module:
-        steps = module.split(".")
-    else:
-        steps = [module]
-    
-    for i in range(len(steps)):
-        module = ".".join(steps[0:i + 1])
-        try:
-            del sys.modules[module]
-        except KeyError:
-            pass
-
-
 def test_noise_setup(sounddevice, numpy):
-    force_reimport('enviroplus.noise')
     from enviroplus.noise import Noise
 
     noise = Noise(sample_rate=16000, duration=0.1)
@@ -34,9 +9,6 @@ def test_noise_setup(sounddevice, numpy):
 
 
 def test_noise_get_amplitudes_at_frequency_ranges(sounddevice, numpy):
-    # Ippity zippidy what is this farce
-    # a curious function that makes my tests pass?
-    force_reimport('enviroplus.noise')
     from enviroplus.noise import Noise
 
     noise = Noise(sample_rate=16000, duration=0.1)
@@ -49,11 +21,10 @@ def test_noise_get_amplitudes_at_frequency_ranges(sounddevice, numpy):
 
 
 def test_noise_get_noise_profile(sounddevice, numpy):
-    # Ippity zippidy what is this farce
-    # a curious function that makes my tests pass?
-    force_reimport('enviroplus.noise')
     from enviroplus.noise import Noise
 
+    numpy.mean.return_value = 10.0
+
     noise = Noise(sample_rate=16000, duration=0.1)
     amp_low, amp_mid, amp_high, amp_total = noise.get_noise_profile(
         noise_floor=100,
@@ -63,11 +34,10 @@ def test_noise_get_noise_profile(sounddevice, numpy):
 
     sounddevice.rec.assert_called_with(0.1 * 16000, samplerate=16000, blocking=True, channels=1, dtype='float64')
 
+    assert amp_total == 10.0
+
 
 def test_get_amplitude_at_frequency_range(sounddevice, numpy):
-    # Ippity zippidy what is this farce
-    # a curious function that makes my tests pass?
-    force_reimport('enviroplus.noise')
     from enviroplus.noise import Noise
 
     noise = Noise(sample_rate=16000, duration=0.1)