r25948: Fix up the samba3sam test (which is very fragile) to work with the new