Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Marionette, low-entropy and mock-induced test flakes. #4451

Merged
merged 3 commits into from
May 20, 2019
Merged

Fix Marionette, low-entropy and mock-induced test flakes. #4451

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7adeef
Fix Marionette, low-entropy and mock-induced test flakes.
rmol May 14, 2019
5bc3cb7
Update Tor Browser to 8.0.9
rmol May 20, 2019
8b19c79
Restore tests/pageslayout/test_source.py::TestSourceSessionLayout
rmol May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion securedrop/dockerfiles/xenial/python2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN curl -LO https://ftp.mozilla.org/pub/firefox/releases/${FF_ESR_VER}/linux-x8

COPY ./tor_project_public.pub /opt/

ENV TBB_VERSION 8.0.8
ENV TBB_VERSION 8.0.9
RUN gpg --import /opt/tor_project_public.pub && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz.asc && \
Expand Down
2 changes: 1 addition & 1 deletion securedrop/dockerfiles/xenial/python3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN curl -LO https://ftp.mozilla.org/pub/firefox/releases/${FF_ESR_VER}/linux-x8

COPY ./tor_project_public.pub /opt/

ENV TBB_VERSION 8.0.8
ENV TBB_VERSION 8.0.9
RUN gpg --import /opt/tor_project_public.pub && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz && \
wget https://www.torproject.org/dist/torbrowser/${TBB_VERSION}/tor-browser-linux64-${TBB_VERSION}_en-US.tar.xz.asc && \
Expand Down
4 changes: 2 additions & 2 deletions securedrop/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def alembic_config(config):
@pytest.fixture(scope='function')
def source_app(config):
app = create_source_app(config)
app.config['SERVER_NAME'] = 'localhost'
app.config['SERVER_NAME'] = 'localhost.localdomain'
with app.app_context():
db.create_all()
yield app
Expand All @@ -150,7 +150,7 @@ def source_app(config):
@pytest.fixture(scope='function')
def journalist_app(config):
app = create_journalist_app(config)
app.config['SERVER_NAME'] = 'localhost'
app.config['SERVER_NAME'] = 'localhost.localdomain'
with app.app_context():
db.create_all()
yield app
Expand Down
Loading