Use config.SECUREDROP_ROOT for worker path in test_worker.py

freedomofpress · Aug 29, 2019 · b2457d9 · b2457d9
1 parent b236051
commit b2457d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/securedrop/bin/run-test b/securedrop/bin/run-test
@@ -8,6 +8,9 @@ export PATH="/opt/venvs/securedrop-app-code/bin:$PATH"
 REPOROOT=$(git rev-parse --show-toplevel)
 cd "${REPOROOT}/securedrop"
 
+PYTHONPATH=".:${PYTHONPATH:-}"
+export PYTHONPATH
+
 source "${BASH_SOURCE%/*}/dev-deps"
 
 run_xvfb

diff --git a/securedrop/tests/test_worker.py b/securedrop/tests/test_worker.py
@@ -22,7 +22,13 @@ def start_rq_worker(config, queue_name=None):
     if queue_name is None:
         queue_name = config.RQ_WORKER_NAME
     return subprocess.Popen(
-        ["/opt/venvs/securedrop-app-code/bin/rqworker", queue_name], preexec_fn=os.setsid
+        [
+            "/opt/venvs/securedrop-app-code/bin/rqworker",
+            "--path",
+            config.SECUREDROP_ROOT,
+            queue_name
+        ],
+        preexec_fn=os.setsid
     )