From 6b0e6312afcdef5eca0b23495b73b64f8d7888ea Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 28 Nov 2018 07:47:54 -0500 Subject: [PATCH 1/4] removed the version restriction on mutagen to take advantage of bug fixes --- python_apps/airtime_analyzer/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py index b51d6fade..6c4f2f0ed 100644 --- a/python_apps/airtime_analyzer/setup.py +++ b/python_apps/airtime_analyzer/setup.py @@ -28,7 +28,7 @@ setup(name='airtime_analyzer', packages=['airtime_analyzer'], scripts=['bin/airtime_analyzer'], install_requires=[ - 'mutagen==1.31', # The Mutagen guys change stuff all the time that break our unit tests. Watch out for this. + 'mutagen', # got rid of specific version requirement 'pika', 'daemon', 'file-magic', From 2ee85f05468547e329ff2403c50e33dfe7136e09 Mon Sep 17 00:00:00 2001 From: vagrant Date: Tue, 4 Dec 2018 00:35:24 +0000 Subject: [PATCH 2/4] made mp3 bitrate test a range vs. exact number because of variation in results from different mutagen versions --- .../tests/metadata_analyzer_tests.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py index 8a2d59967..0ddaad1a9 100644 --- a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py +++ b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py @@ -24,7 +24,8 @@ def test_mp3_mono(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-mono.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 1 - assert metadata['bit_rate'] == 64876 + assert metadata['bit_rate'] > 63000 + assert metadata['bit_rate'] < 65000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' # Not unicode because MIMEs aren't. assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -34,7 +35,8 @@ def test_mp3_jointstereo(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-jointstereo.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] == 129757 + assert metadata['bit_rate'] < 130000 + assert metadata['bit_rate'] > 127000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -43,7 +45,8 @@ def test_mp3_simplestereo(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-simplestereo.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] == 129757 + assert metadata['bit_rate'] < 130000 + assert metadata['bit_rate'] > 127000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -52,7 +55,8 @@ def test_mp3_dualmono(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-dualmono.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] == 129757 + assert metadata['bit_rate'] < 130000 + assert metadata['bit_rate'] > 127000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -109,7 +113,8 @@ def test_mp3_utf8(): assert metadata['genre'] == u'Я Б Г Д Ж Й' assert metadata['track_number'] == u'1' assert metadata['channels'] == 2 - assert metadata['bit_rate'] == 129757 + assert metadata['bit_rate'] < 130000 + assert metadata['bit_rate'] > 127000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -153,7 +158,8 @@ def test_mp3_bad_channels(): metadata = MetadataAnalyzer.analyze(filename, dict()) check_default_metadata(metadata) assert metadata['channels'] == 1 - assert metadata['bit_rate'] == 64876 + assert metadata['bit_rate'] < 65000 + assert metadata['bit_rate'] > 63000 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' # Not unicode because MIMEs aren't. assert metadata['track_total'] == u'10' # MP3s can have a track_total From f673d92edd32de69482530148d84fb3832385cf8 Mon Sep 17 00:00:00 2001 From: Robbt Date: Thu, 13 Dec 2018 08:53:52 -0500 Subject: [PATCH 3/4] modified bitrates to match new mutagen values --- .../tests/metadata_analyzer_tests.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py index 0ddaad1a9..6e267d562 100644 --- a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py +++ b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py @@ -24,8 +24,7 @@ def test_mp3_mono(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-mono.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 1 - assert metadata['bit_rate'] > 63000 - assert metadata['bit_rate'] < 65000 + assert metadata['bit_rate'] == 63998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' # Not unicode because MIMEs aren't. assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -35,8 +34,7 @@ def test_mp3_jointstereo(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-jointstereo.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] < 130000 - assert metadata['bit_rate'] > 127000 + assert metadata['bit_rate'] == 127998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -45,8 +43,7 @@ def test_mp3_simplestereo(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-simplestereo.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] < 130000 - assert metadata['bit_rate'] > 127000 + assert metadata['bit_rate'] == 127998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -55,8 +52,7 @@ def test_mp3_dualmono(): metadata = MetadataAnalyzer.analyze(u'tests/test_data/44100Hz-16bit-dualmono.mp3', dict()) check_default_metadata(metadata) assert metadata['channels'] == 2 - assert metadata['bit_rate'] < 130000 - assert metadata['bit_rate'] > 127000 + assert metadata['bit_rate'] == 127998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' assert metadata['track_total'] == u'10' # MP3s can have a track_total @@ -158,8 +154,7 @@ def test_mp3_bad_channels(): metadata = MetadataAnalyzer.analyze(filename, dict()) check_default_metadata(metadata) assert metadata['channels'] == 1 - assert metadata['bit_rate'] < 65000 - assert metadata['bit_rate'] > 63000 + assert metadata['bit_rate'] < 63998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' # Not unicode because MIMEs aren't. assert metadata['track_total'] == u'10' # MP3s can have a track_total From a2573b52d224b4fce3dd08b354f60357a31a97e5 Mon Sep 17 00:00:00 2001 From: Robbt Date: Thu, 13 Dec 2018 08:58:59 -0500 Subject: [PATCH 4/4] fixed bad operator --- python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py index 6e267d562..2af30326b 100644 --- a/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py +++ b/python_apps/airtime_analyzer/tests/metadata_analyzer_tests.py @@ -154,7 +154,7 @@ def test_mp3_bad_channels(): metadata = MetadataAnalyzer.analyze(filename, dict()) check_default_metadata(metadata) assert metadata['channels'] == 1 - assert metadata['bit_rate'] < 63998 + assert metadata['bit_rate'] == 63998 assert abs(metadata['length_seconds'] - 3.9) < 0.1 assert metadata['mime'] == 'audio/mp3' # Not unicode because MIMEs aren't. assert metadata['track_total'] == u'10' # MP3s can have a track_total