From: Thomas Fillon Date: Fri, 8 Nov 2013 09:20:16 +0000 (+0100) Subject: Fix issues in doctest : add doctest Ellipsis on timeside version + clean up test_run_... X-Git-Tag: 0.5.1-2~1^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=60729255bf51d650050ae22307b463a65a3d35cd;p=timeside.git Fix issues in doctest : add doctest Ellipsis on timeside version + clean up test_run_all_doctests --- diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst index 105358b..d02b949 100644 --- a/doc/source/tutorial/quick_start.rst +++ b/doc/source/tutorial/quick_start.rst @@ -59,4 +59,4 @@ analysis and encoding: >>> encoders = timeside.encoder.Mp3Encoder('sweep.mp3') | timeside.encoder.FlacEncoder('sweep.flac') >>> (decoder | levels | encoders).run() >>> print levels.results - {'level.max': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Analyzer Max', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={}), 'level.rms': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level Analyzer RMS', unit='dBFS', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={})} + {'level.max': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Analyzer Max', unit='dBFS', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={}), 'level.rms': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level Analyzer RMS', unit='dBFS', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, channels=None, channelsManagement=''), parameters={})} diff --git a/tests/test_run_all_doctests.py b/tests/test_run_all_doctests.py index 299f6ac..97b9673 100755 --- a/tests/test_run_all_doctests.py +++ b/tests/test_run_all_doctests.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python # -*- coding: utf-8 -*- # # Copyright (c) 2007-2013 Parisson SARL @@ -27,9 +28,6 @@ import pkgutil def load_tests(loader, tests, ignore): - import fnmatch - import os - finder = doctest.DocTestFinder(exclude_empty=False) # Create tests for doctest in timeside modules and sub-modules @@ -40,7 +38,7 @@ def load_tests(loader, tests, ignore): for module in modules_list: tests.addTests(doctest.DocTestSuite(module, test_finder=finder)) - + print tests return tests diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py index 2e84567..3abadb3 100644 --- a/timeside/analyzer/core.py +++ b/timeside/analyzer/core.py @@ -740,7 +740,7 @@ class AnalyzerResultContainer(dict): >>> a = timeside.analyzer.Analyzer() >>> (d|a).run() #doctest: +ELLIPSIS >>> a.new_result() #doctest: +ELLIPSIS - FrameValueResult(id_metadata=IdMetadata(id='analyzer', name='Generic analyzer', unit='', description='', date='...', version='0.5.1', author='TimeSide', uuid='...'), data_object=DataObject(value=array([], dtype=float64)), audio_metadata=AudioMetadata(uri='file:///...', start=1.0, duration=7.0, is_segment=True, channels=None, channelsManagement=''), frame_metadata=FrameMetadata(samplerate=44100, blocksize=8192, stepsize=8192), parameters={}) + FrameValueResult(id_metadata=IdMetadata(id='analyzer', name='Generic analyzer', unit='', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([], dtype=float64)), audio_metadata=AudioMetadata(uri='file:///...', start=1.0, duration=7.0, is_segment=True, channels=None, channelsManagement=''), frame_metadata=FrameMetadata(samplerate=44100, blocksize=8192, stepsize=8192), parameters={}) >>> resContainer = timeside.analyzer.core.AnalyzerResultContainer() '''