diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-13 19:41:34 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-13 19:41:34 +0100 |
| commit | eb1f8a499a99d315601016777dd492a8a25a3ea7 (patch) | |
| tree | 0c5bafb616fe32f83536af47e218cf876e20fa49 /tests/functionaltests/test_ping.c | |
| parent | 0ef00e87ab2fcb1952dda6055922e74cb3413609 (diff) | |
| parent | a48b9fcec2385c5d571f1f02ed6e769d6b4ee821 (diff) | |
| download | profani-tty-eb1f8a499a99d315601016777dd492a8a25a3ea7.tar.gz | |
Merge branch 'master' into openpgp
Diffstat (limited to 'tests/functionaltests/test_ping.c')
| -rw-r--r-- | tests/functionaltests/test_ping.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/functionaltests/test_ping.c b/tests/functionaltests/test_ping.c index e2ca79ca..76fd979c 100644 --- a/tests/functionaltests/test_ping.c +++ b/tests/functionaltests/test_ping.c @@ -14,18 +14,18 @@ void ping_multiple(void **state) { - stbbr_for_id("prof_ping_1", - "<iq id=\"prof_ping_1\" type=\"result\" to=\"stabber@localhost/profanity\"/>" - ); stbbr_for_id("prof_ping_2", "<iq id=\"prof_ping_2\" type=\"result\" to=\"stabber@localhost/profanity\"/>" ); + stbbr_for_id("prof_ping_3", + "<iq id=\"prof_ping_3\" type=\"result\" to=\"stabber@localhost/profanity\"/>" + ); - prof_connect("stabber@localhost", "password"); + prof_connect(); prof_input("/ping"); assert_true(stbbr_received( - "<iq id=\"prof_ping_1\" type=\"get\">" + "<iq id=\"prof_ping_2\" type=\"get\">" "<ping xmlns=\"urn:xmpp:ping\"/>" "</iq>" )); @@ -33,7 +33,7 @@ ping_multiple(void **state) prof_input("/ping"); assert_true(stbbr_received( - "<iq id=\"prof_ping_2\" type=\"get\">" + "<iq id=\"prof_ping_3\" type=\"get\">" "<ping xmlns=\"urn:xmpp:ping\"/>" "</iq>" )); @@ -43,9 +43,7 @@ ping_multiple(void **state) void ping_responds(void **state) { - prof_connect("stabber@localhost", "password"); - - assert_true(prof_output_exact("stabber@localhost logged in successfully")); + prof_connect(); stbbr_send( "<iq id=\"pingtest1\" type=\"get\" to=\"stabber@localhost/profanity\" from=\"localhost\">" |