Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
funkwhale
funkwhale
Commits
27ff3a4c
Commit
27ff3a4c
authored
Jun 25, 2017
by
Eliot Berriot
Browse files
Fixed failing tests
parent
0327d72f
Pipeline
#43
failed with stages
in 0 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
api/config/settings/test.py
View file @
27ff3a4c
...
...
@@ -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
api/docker/Dockerfile.base
deleted
100644 → 0
View file @
0327d72f
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
api/docker/Dockerfile.local
deleted
100644 → 0
View file @
0327d72f
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
api/docker/Dockerfile.test
View file @
27ff3a4c
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
api/funkwhale_api/radios/radios.py
View file @
27ff3a4c
...
...
@@ -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
):
...
...
api/funkwhale_api/radios/tests/test_radios.py
View file @
27ff3a4c
...
...
@@ -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
()]
...
...
api/requirements/test.txt
View file @
27ff3a4c
...
...
@@ -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
api/test.yml
View file @
27ff3a4c
...
...
@@ -6,4 +6,3 @@ test:
-
.:/app
environment
:
-
DJANGO_SETTINGS_MODULE=config.settings.test
-
API_AUTHENTICATION_REQUIRED=False
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment