From a49d7284f3e1bee5a95eafeab9a816a2fa7112dd Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 24 May 2016 14:45:32 +0100 Subject: add a script for jenkins to run --- python/test_olm.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'python/test_olm.sh') diff --git a/python/test_olm.sh b/python/test_olm.sh index b575cbf..9c72556 100755 --- a/python/test_olm.sh +++ b/python/test_olm.sh @@ -1,5 +1,7 @@ #! /bin/bash +cd `dirname $0` + OLM="python -m olm" ALICE_ACCOUNT=alice.account -- cgit v1.2.3 From 8d55954ce13b9f93cc220bcbaab56fb236d16c9c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 24 May 2016 16:50:26 +0100 Subject: Avoid use of jq in test_olm I want to use test_olm.sh on jenkins, which lacks jq. Hence, add support to olm.main to get id and one-time keys individually. --- python/test_olm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python/test_olm.sh') diff --git a/python/test_olm.sh b/python/test_olm.sh index 9c72556..916322e 100755 --- a/python/test_olm.sh +++ b/python/test_olm.sh @@ -16,8 +16,8 @@ $OLM create_account $ALICE_ACCOUNT $OLM create_account $BOB_ACCOUNT $OLM generate_keys $BOB_ACCOUNT 1 -BOB_IDENTITY_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r .account_keys.curve25519)" -BOB_ONE_TIME_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r '.one_time_keys.curve25519|to_entries[0].value')" +BOB_IDENTITY_KEY="$($OLM identity_key $BOB_ACCOUNT)" +BOB_ONE_TIME_KEY="$($OLM one_time_key $BOB_ACCOUNT)" $OLM outbound $ALICE_ACCOUNT $ALICE_SESSION "$BOB_IDENTITY_KEY" "$BOB_ONE_TIME_KEY" -- cgit v1.2.3