Merge qa_loader and create-dev-data; add seen data.

There was a lot of overlap between qa_loader.py and create-dev-data.py, so we're consolidating them.
freedomofpress · Nov 19, 2020 · 836e151 · 836e151
1 parent 3cee008
commit 836e151
Show file tree

Hide file tree

Showing 9 changed files with 427 additions and 553 deletions.
diff --git a/molecule/upgrade/side_effect.yml b/molecule/upgrade/side_effect.yml
@@ -22,14 +22,14 @@
       args:
         chdir: /var/www/securedrop
 
-    - name: Slap in latest create-dev-data script
+    - name: Slap in latest loaddata script
       copy:
-        src: ../../securedrop/create-dev-data.py
-        dest: /var/www/securedrop/create-dev-data.py
+        src: ../../securedrop/loaddata.py
+        dest: /var/www/securedrop/loaddata.py
         mode: 0555
 
     - name: Insert journalist test user
-      command: /var/www/securedrop/create-dev-data.py --staging
+      command: /var/www/securedrop/loaddata.py
       args:
         chdir: /var/www/securedrop
   become: yes
diff --git a/securedrop/bin/dev-deps b/securedrop/bin/dev-deps
@@ -92,5 +92,5 @@ function reset_demo() {
 
     gpg2 --homedir /var/lib/securedrop/keys --no-default-keyring --keyring /var/lib/securedrop/keys/pubring.gpg --import /var/lib/securedrop/keys/test_journalist_key.pub
 
-    ./create-dev-data.py
+    ./loaddata.py
 }
diff --git a/securedrop/bin/dev-shell b/securedrop/bin/dev-shell
@@ -67,6 +67,7 @@ function docker_run() {
            -p "127.0.0.1:${SD_HOSTPORT_VNC}:5909" \
            -p "127.0.0.1:${SD_HOSTPORT_SI}:8080" \
            -p "127.0.0.1:${SD_HOSTPORT_JI}:8081" \
+           -e NUM_JOURNALISTS \
            -e NUM_SOURCES \
            -e LC_ALL=C.UTF-8 \
            -e LANG=C.UTF-8 \

diff --git a/securedrop/create-dev-data.py b/securedrop/create-dev-data.py