From 27ff3a4ce68798c89ddba0157f7c94835ad86150 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 25 Jun 2017 17:12:41 +0200 Subject: [PATCH] Fixed failing tests --- api/config/settings/test.py | 1 + api/docker/Dockerfile.base | 10 ---------- api/docker/Dockerfile.local | 12 ------------ api/docker/Dockerfile.test | 10 ++++++++-- api/funkwhale_api/radios/radios.py | 2 +- api/funkwhale_api/radios/tests/test_radios.py | 3 +-- api/requirements/test.txt | 2 +- api/test.yml | 1 - 8 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 api/docker/Dockerfile.base delete mode 100644 api/docker/Dockerfile.local diff --git a/api/config/settings/test.py b/api/config/settings/test.py index 1323ff35a..b8dd89b04 100644 --- a/api/config/settings/test.py +++ b/api/config/settings/test.py @@ -32,3 +32,4 @@ CELERY_ALWAYS_EAGER = True ########## END CELERY # Your local stuff: Below this line define 3rd party library settings +API_AUTHENTICATION_REQUIRED = False diff --git a/api/docker/Dockerfile.base b/api/docker/Dockerfile.base deleted file mode 100644 index 2617c9587..000000000 --- a/api/docker/Dockerfile.base +++ /dev/null @@ -1,10 +0,0 @@ -FROM python:3.5 - -ENV PYTHONUNBUFFERED 1 - -# Requirements have to be pulled and installed here, otherwise caching won't work -COPY ./requirements.apt /requirements.apt -COPY ./install_os_dependencies.sh /install_os_dependencies.sh -RUN bash install_os_dependencies.sh install -COPY ./requirements /requirements -RUN pip install -r /requirements/base.txt diff --git a/api/docker/Dockerfile.local b/api/docker/Dockerfile.local deleted file mode 100644 index b70410459..000000000 --- a/api/docker/Dockerfile.local +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:3.5 - -ENV PYTHONUNBUFFERED 1 - -# Requirements have to be pulled and installed here, otherwise caching won't work -COPY ./requirements.apt /requirements.apt -COPY ./install_os_dependencies.sh /install_os_dependencies.sh -RUN bash install_os_dependencies.sh install -COPY ./requirements /requirements -RUN pip install -r /requirements/local.txt - -WORKDIR /app diff --git a/api/docker/Dockerfile.test b/api/docker/Dockerfile.test index f2e2ef893..0d8224879 100644 --- a/api/docker/Dockerfile.test +++ b/api/docker/Dockerfile.test @@ -1,4 +1,4 @@ -FROM funkwhale/apibase +FROM python:3.5 ENV PYTHONUNBUFFERED 1 @@ -6,8 +6,14 @@ ENV PYTHONUNBUFFERED 1 COPY ./requirements.apt /requirements.apt COPY ./install_os_dependencies.sh /install_os_dependencies.sh RUN bash install_os_dependencies.sh install -COPY ./requirements /requirements + +RUN mkdir /requirements + +COPY ./requirements/base.txt /requirements +RUN pip install -r /requirements/base.txt +COPY ./requirements/local.txt /requirements RUN pip install -r /requirements/local.txt +COPY ./requirements/test.txt /requirements RUN pip install -r /requirements/test.txt WORKDIR /app diff --git a/api/funkwhale_api/radios/radios.py b/api/funkwhale_api/radios/radios.py index 0f2632fe9..43819b9c4 100644 --- a/api/funkwhale_api/radios/radios.py +++ b/api/funkwhale_api/radios/radios.py @@ -50,7 +50,7 @@ class SessionRadio(SimpleRadio): def filter_from_session(self, queryset): already_played = self.session.session_tracks.all().values_list('track', flat=True) - queryset = queryset.exclude(pk__in=already_played) + queryset = queryset.exclude(pk__in=list(already_played)) return queryset def pick(self, **kwargs): diff --git a/api/funkwhale_api/radios/tests/test_radios.py b/api/funkwhale_api/radios/tests/test_radios.py index eb839a426..7d069be9c 100644 --- a/api/funkwhale_api/radios/tests/test_radios.py +++ b/api/funkwhale_api/radios/tests/test_radios.py @@ -74,12 +74,11 @@ class TestRadios(TestCase): def test_can_use_radio_session_to_filter_choices(self): tracks = mommy.make('music.Track', _quantity=30) - radio = radios.RandomRadio() session = radio.start_session(self.user) for i in range(30): - radio.pick() + p = radio.pick() # ensure 30 differents tracks have been suggested tracks_id = [session_track.track.pk for session_track in session.session_tracks.all()] diff --git a/api/requirements/test.txt b/api/requirements/test.txt index e3540b72d..bcb6ef060 100644 --- a/api/requirements/test.txt +++ b/api/requirements/test.txt @@ -7,6 +7,6 @@ coverage==4.0.3 django_coverage_plugin==1.1 flake8==2.5.0 django-test-plus==1.0.11 -factory_boy==2.6.0 +factory_boy>=2.8.1 model_mommy tox diff --git a/api/test.yml b/api/test.yml index c28a8138c..dc50a9b54 100644 --- a/api/test.yml +++ b/api/test.yml @@ -6,4 +6,3 @@ test: - .:/app environment: - DJANGO_SETTINGS_MODULE=config.settings.test - - API_AUTHENTICATION_REQUIRED=False