From 4eec2e763dd9dafeaca968dd7570de43117c76ce Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 3 Feb 2019 12:51:44 +0200 Subject: [PATCH] Only run test_love on a single Python version to avoid collisions --- tests/test_network.py | 9 +++------ tests/test_pylast.py | 4 ++++ tests/test_track.py | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/test_network.py b/tests/test_network.py index 33c349e..448e535 100755 --- a/tests/test_network.py +++ b/tests/test_network.py @@ -2,19 +2,16 @@ """ Integration (not unit) tests for pylast.py """ -import sys import time import unittest import pylast -from .test_pylast import TestPyLastWithLastFm +from .test_pylast import PY37, TestPyLastWithLastFm class TestPyLastNetwork(TestPyLastWithLastFm): - @unittest.skipUnless( - sys.version_info[:2] == (3, 7), "Only run on Python 3.7 to avoid collisions" - ) + @unittest.skipUnless(PY37, "Only run on Python 3.7 to avoid collisions") def test_scrobble(self): # Arrange artist = "test artist" @@ -24,9 +21,9 @@ class TestPyLastNetwork(TestPyLastWithLastFm): # Act self.network.scrobble(artist=artist, title=title, timestamp=timestamp) + time.sleep(1) # Delay, for Last.fm latency. TODO Can this be removed later? # Assert - time.sleep(1) # Delay, for Last.fm latency. TODO Can this be removed later? # limit=2 to ignore now-playing: last_scrobble = lastfm_user.get_recent_tracks(limit=2)[0] self.assertEqual(str(last_scrobble.track.artist).lower(), artist) diff --git a/tests/test_pylast.py b/tests/test_pylast.py index bb88225..b417fb8 100755 --- a/tests/test_pylast.py +++ b/tests/test_pylast.py @@ -3,6 +3,7 @@ Integration (not unit) tests for pylast.py """ import os +import sys import time import unittest @@ -12,6 +13,9 @@ from flaky import flaky import pylast +PY37 = sys.version_info[:2] == (3, 7) + + def load_secrets(): secrets_file = "test_pylast.yaml" if os.path.isfile(secrets_file): diff --git a/tests/test_track.py b/tests/test_track.py index b65d6be..bce28db 100755 --- a/tests/test_track.py +++ b/tests/test_track.py @@ -6,10 +6,11 @@ import unittest import pylast -from .test_pylast import TestPyLastWithLastFm +from .test_pylast import PY37, TestPyLastWithLastFm class TestPyLastTrack(TestPyLastWithLastFm): + @unittest.skipUnless(PY37, "Only run on Python 3.7 to avoid collisions") def test_love(self): # Arrange artist = "Test Artist"