Merge pull request #4451 from rmol/fix-4433-tbb-flakes

Fix Marionette, low-entropy and mock-induced test flakes.
freedomofpress · May 20, 2019 · 82eed07 · 82eed07
2 parents 72ed2e3 + 8b19c79
commit 82eed07
Show file tree

Hide file tree

Showing 14 changed files with 249 additions and 214 deletions.
diff --git a/securedrop/dockerfiles/xenial/python2/Dockerfile b/securedrop/dockerfiles/xenial/python2/Dockerfile
@@ -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 && \

diff --git a/securedrop/dockerfiles/xenial/python3/Dockerfile b/securedrop/dockerfiles/xenial/python3/Dockerfile
@@ -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 && \

diff --git a/securedrop/tests/conftest.py b/securedrop/tests/conftest.py
@@ -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
@@ -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