Merge pull request #5645 from freedomofpress/fix-5514

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

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

securedrop/bin/dev-deps

@@ -92,5 +92,13 @@ 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
+    # Can't pass an array environment variable with "docker --env", so
+    # break up the string we can pass.
+    if [ -n "${LOADDATA_ARGS:-""}" ]
+    then
+        IFS=" " read -r -a loaddata_arg_array <<< "${LOADDATA_ARGS}"
+        ./loaddata.py "${loaddata_arg_array[@]}"
+    else
+        ./loaddata.py
+    fi
 }

securedrop/bin/dev-shell

@@ -74,7 +74,9 @@ 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 LOADDATA_ARGS \
            -e LC_ALL=C.UTF-8 \
            -e LANG=C.UTF-8 \
            -e PAGE_LAYOUT_LOCALES \