X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/398cddaf295547448571526ec6205b35d3ba0bfc..8aab644db9baa4feb5ccef4f43144313278f4691:/run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index b41a460d..5d8b8c1d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -47,13 +47,13 @@ register() {
   PIN=$2
   echo -n "Enter a captcha token (https://signalcaptchas.org/staging/challenge/generate.html): "
   read CAPTCHA
-  run_main -u "$NUMBER" register --captcha "$CAPTCHA"
+  run_main -a "$NUMBER" register --captcha "$CAPTCHA"
   echo -n "Enter validation code for ${NUMBER}: "
   read CODE
   if [ -z "$PIN" ]; then
-    run_main -u "$NUMBER" verify "$CODE"
+    run_main -a "$NUMBER" verify "$CODE"
   else
-    run_main -u "$NUMBER" verify "$CODE" --pin "$PIN"
+    run_main -a "$NUMBER" verify "$CODE" --pin "$PIN"
   fi
 }
 
@@ -64,12 +64,12 @@ link() {
   mkfifo "$LINK_CODE_FILE"
   run_linked link -n "test-device" >"$LINK_CODE_FILE" &
   read LINK_CODE <"$LINK_CODE_FILE"
-  run_main -u "$NUMBER" addDevice --uri "$LINK_CODE"
+  run_main -a "$NUMBER" addDevice --uri "$LINK_CODE"
   wait
-  run_linked -u "$NUMBER" send --note-to-self -m hi
-  run_main -u "$NUMBER" receive
-  run_linked -u "$NUMBER" receive
-  run_main -u "$NUMBER" receive
+  run_linked -a "$NUMBER" send --note-to-self -m hi
+  run_main -a "$NUMBER" receive
+  run_linked -a "$NUMBER" receive
+  run_main -a "$NUMBER" receive
 }
 
 run_main --version
@@ -83,12 +83,12 @@ sleep 5
 
 
 ## DBus
-#run_main -u "$NUMBER_1" --dbus send "$NUMBER_2" -m daemon_not_running || true
+#run_main -a "$NUMBER_1" --dbus send "$NUMBER_2" -m daemon_not_running || true
 #run_main daemon &
 #DAEMON_PID=$!
 #sleep 10
-#run_main -u "$NUMBER_1" --dbus send "$NUMBER_2" -m hii
-#run_main -u "$NUMBER_2" --dbus receive
+#run_main -a "$NUMBER_1" --dbus send "$NUMBER_2" -m hii
+#run_main -a "$NUMBER_2" --dbus receive
 #kill "$DAEMON_PID"
 
 
@@ -98,8 +98,8 @@ FIFO_FILE="${PATH_MAIN}/dbus-fifo"
 rm -f "$FIFO_FILE"
 mkfifo "$FIFO_FILE"
 
-run_main -u "$NUMBER_1" send "$NUMBER_2" -m hi
-run_main -u "$NUMBER_2" jsonRpc < "$FIFO_FILE" &
+run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
+run_main -a "$NUMBER_2" jsonRpc < "$FIFO_FILE" &
 
 exec 3<> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":"id","method":"updateContact","params":{"recipient":"'"$NUMBER_1"'","name":"NUMBER_1","expiration":10}}' >&3
@@ -126,75 +126,75 @@ exec 3>&-
 
 wait
 
-run_main -u "$NUMBER_1" setPin "$TEST_PIN_1"
-run_main -u "$NUMBER_2" removePin
+run_main -a "$NUMBER_1" setPin "$TEST_PIN_1"
+run_main -a "$NUMBER_2" removePin
 
 ## Contacts
-run_main -u "$NUMBER_2" updateContact "$NUMBER_1" -n NUMBER_1 -e 10
-run_main -u "$NUMBER_2" block "$NUMBER_1"
-run_main -u "$NUMBER_2" unblock "$NUMBER_1"
-run_main -u "$NUMBER_2" listContacts
-
-run_main -u "$NUMBER_1" send "$NUMBER_2" -m hi
-run_main -u "$NUMBER_2" receive
-run_main -u "$NUMBER_2" send "$NUMBER_1" -m hi
-run_main -u "$NUMBER_1" receive
-run_main -u "$NUMBER_2" receive
+run_main -a "$NUMBER_2" updateContact "$NUMBER_1" -n NUMBER_1 -e 10
+run_main -a "$NUMBER_2" block "$NUMBER_1"
+run_main -a "$NUMBER_2" unblock "$NUMBER_1"
+run_main -a "$NUMBER_2" listContacts
+
+run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
+run_main -a "$NUMBER_2" receive
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_2" receive
 ## Groups
-GROUP_ID=$(run_main -u "$NUMBER_1" updateGroup -n GRUPPE -a LICENSE -m "$NUMBER_1" | grep -oP '(?<=").+(?=")')
-run_main -u "$NUMBER_1" send "$NUMBER_2" -m first
-run_main -u "$NUMBER_1" updateGroup -g "$GROUP_ID" -n GRUPPE_UMB -m "$NUMBER_2" --admin "$NUMBER_2" --remove-admin "$NUMBER_2" --description DESCRIPTION --link=enabled-with-approval --set-permission-add-member=only-admins --set-permission-edit-details=only-admins -e 42
-run_main -u "$NUMBER_1" listGroups -d
-run_main -u "$NUMBER_1" --output=json listGroups -d
-run_main -u "$NUMBER_2" --verbose receive
-run_main -u "$NUMBER_2" quitGroup -g "$GROUP_ID"
-run_main -u "$NUMBER_2" listGroups -d
-run_main -u "$NUMBER_2" --output=json listGroups -d
-run_main -u "$NUMBER_1" receive
-run_main -u "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
-run_main -u "$NUMBER_1" --verbose block -g "$GROUP_ID"
-run_main -u "$NUMBER_1" --verbose unblock -g "$GROUP_ID"
+GROUP_ID=$(run_main -a "$NUMBER_1" updateGroup -n GRUPPE -a LICENSE -m "$NUMBER_1" | grep -oP '(?<=").+(?=")')
+run_main -a "$NUMBER_1" send "$NUMBER_2" -m first
+run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -n GRUPPE_UMB -m "$NUMBER_2" --admin "$NUMBER_2" --remove-admin "$NUMBER_2" --description DESCRIPTION --link=enabled-with-approval --set-permission-add-member=only-admins --set-permission-edit-details=only-admins -e 42
+run_main -a "$NUMBER_1" listGroups -d
+run_main -a "$NUMBER_1" --output=json listGroups -d
+run_main -a "$NUMBER_2" --verbose receive
+run_main -a "$NUMBER_2" quitGroup -g "$GROUP_ID"
+run_main -a "$NUMBER_2" listGroups -d
+run_main -a "$NUMBER_2" --output=json listGroups -d
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
+run_main -a "$NUMBER_1" --verbose block -g "$GROUP_ID"
+run_main -a "$NUMBER_1" --verbose unblock -g "$GROUP_ID"
 
 ## Identities
-run_main -u "$NUMBER_1" listIdentities
-run_main -u "$NUMBER_2" listIdentities
-run_main -u "$NUMBER_2" trust "$NUMBER_1" -a
+run_main -a "$NUMBER_1" listIdentities
+run_main -a "$NUMBER_2" listIdentities
+run_main -a "$NUMBER_2" trust "$NUMBER_1" -a
 
 ## Basic send/receive
 for OUTPUT in "plain-text" "json"; do
-  run_main -u "$NUMBER_1" --output="$OUTPUT" getUserStatus "$NUMBER_1" "$NUMBER_2" "+111111111"
-  run_main -u "$NUMBER_1" send "$NUMBER_2" -m hi
-  run_main -u "$NUMBER_2" send "$NUMBER_1" -m hi
-  run_main -u "$NUMBER_1" send -g "$GROUP_ID" -m hi -a LICENSE
-  TIMESTAMP=$(uname -a | run_main -u "$NUMBER_1" send "$NUMBER_2")
-  run_main -u "$NUMBER_2" sendReaction "$NUMBER_1" -e 🍀 -a "$NUMBER_1" -t "$TIMESTAMP"
-  run_main -u "$NUMBER_1" remoteDelete "$NUMBER_2" -t "$TIMESTAMP"
-  run_main -u "$NUMBER_2" --output="$OUTPUT" receive
-  run_main -u "$NUMBER_1" --output="$OUTPUT" receive
-  run_main -u "$NUMBER_1" send -e "$NUMBER_2"
-  run_main -u "$NUMBER_2" --output="$OUTPUT" receive
+  run_main -a "$NUMBER_1" --output="$OUTPUT" getUserStatus "$NUMBER_1" "$NUMBER_2" "+111111111"
+  run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
+  run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+  run_main -a "$NUMBER_1" send -g "$GROUP_ID" -m hi -a LICENSE
+  TIMESTAMP=$(uname -a | run_main -a "$NUMBER_1" send "$NUMBER_2")
+  run_main -a "$NUMBER_2" sendReaction "$NUMBER_1" -e 🍀 -a "$NUMBER_1" -t "$TIMESTAMP"
+  run_main -a "$NUMBER_1" remoteDelete "$NUMBER_2" -t "$TIMESTAMP"
+  run_main -a "$NUMBER_2" --output="$OUTPUT" receive
+  run_main -a "$NUMBER_1" --output="$OUTPUT" receive
+  run_main -a "$NUMBER_1" send -e "$NUMBER_2"
+  run_main -a "$NUMBER_2" --output="$OUTPUT" receive
 done
 
 ## Profile
-run_main -u "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE
+run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE
 
 ## Provisioning
 link "$NUMBER_1"
 link "$NUMBER_2"
-run_main -u "$NUMBER_1" listDevices
-run_linked -u "$NUMBER_1" sendSyncRequest
-run_main -u "$NUMBER_1" sendContacts
+run_main -a "$NUMBER_1" listDevices
+run_linked -a "$NUMBER_1" sendSyncRequest
+run_main -a "$NUMBER_1" sendContacts
 
 for OUTPUT in "plain-text" "json"; do
-  run_main -u "$NUMBER_1" send "$NUMBER_2" -m hi
-  run_main -u "$NUMBER_2" send "$NUMBER_1" -m hi
-  run_main -u "$NUMBER_2" --output="$OUTPUT" receive
-  run_main -u "$NUMBER_1" --output="$OUTPUT" receive
-  run_linked -u "$NUMBER_1" --output="$OUTPUT" receive
+  run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
+  run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+  run_main -a "$NUMBER_2" --output="$OUTPUT" receive
+  run_main -a "$NUMBER_1" --output="$OUTPUT" receive
+  run_linked -a "$NUMBER_1" --output="$OUTPUT" receive
 done
 
-run_main -u "$NUMBER_1" removeDevice -d 2
+run_main -a "$NUMBER_1" removeDevice -d 2
 
 ## Unregister
-run_main -u "$NUMBER_1" unregister
-run_main -u "$NUMBER_2" unregister --delete-account
+run_main -a "$NUMBER_1" unregister
+run_main -a "$NUMBER_2" unregister --delete-account