summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2005-09-11 10:02:47 +0000
committerMark McLoughlin <mark@skynet.ie>2005-09-11 10:02:47 +0000
commit5e8110d79aa8c11ad76b3e77791e3e6daca0fa32 (patch)
tree666a413cc550c06bedb3092acddf87b57df4b80e /test
parent24c6ddc1a41e280c877233f98569d4e21d12f1ef (diff)
2005-09-11 Mark McLoughlin <mark@skynet.ie>
* test/data/auth/fallback.auth-script: we don't retry the EXTERNAL method when we know its going to fail anymore. 2005-09-11 Mark McLoughlin <mark@skynet.ie> * dbus/dbus-connection-internal.h: rename (add|remove|toggle)_(watch|timeout) to unlocked() * dbus/dbus-connection.c: ditto. * dbus/dbus-timeout.c, dbus/dbus-transport-unix.c: Update some callers for the renaming. 2005-09-10 Mark McLoughlin <mark@skynet.ie> * dbus/dbus-auth.c: (record_mechanisms): don't retry the first auth mechanism because we know we're just going to get rejected again. * dbus/dbus-keyring.c: (_dbus_keyring_reload): Fix thinko ... and what a nasty little bugger to track down you were ... * dbus/dbus-connection.c: (_dbus_connection_add_watch), (_dbus_connection_remove_watch): add note about these needing the connection to be locked. (_dbus_connection_get_dispatch_status_unlocked): set status to DATA_REMAINS when we queue the disconnected message. * bus/dispatch.c: (bus_dispatch): fix warning. (check_existent_service_no_auto_start): Expect ChildSignaled error too. (check_existent_hello_from_self): fix another couple of warnings.
Diffstat (limited to 'test')
-rw-r--r--test/data/auth/fallback.auth-script5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/data/auth/fallback.auth-script b/test/data/auth/fallback.auth-script
index f598b77e..0d880c00 100644
--- a/test/data/auth/fallback.auth-script
+++ b/test/data/auth/fallback.auth-script
@@ -7,11 +7,6 @@ CLIENT
EXPECT_COMMAND AUTH
SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH'
-## Will try EXTERNAL again.
-
-EXPECT_COMMAND AUTH
-SEND 'REJECTED EXTERNAL DBUS_COOKIE_SHA1 DBUS_TEST_NONEXISTENT_MECH'
-
## And this time we get DBUS_COOKIE_SHA1
EXPECT_COMMAND AUTH