diff options
Diffstat (limited to 'wintest')
-rwxr-xr-x | wintest/test-s4-howto.py | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index db847a67818..b42c84d829b 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -221,37 +221,37 @@ def test_dcpromo(t, vm): t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM} -k yes", ["INBOUND NEIGHBORS", - "${BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${BASEDN}", # cope with either order - "Last attempt .* was successful", - "OUTBOUND NEIGHBORS", - "${BASEDN}", - "Last success", - "CN=Configuration,${BASEDN}", - "Last success", - "CN=Configuration,${BASEDN}", - "Last success"], + "${BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${BASEDN}", # cope with either order + "Last attempt .* was successful", + "OUTBOUND NEIGHBORS", + "${BASEDN}", + "Last success", + "CN=Configuration,${BASEDN}", + "Last success", + "CN=Configuration,${BASEDN}", + "Last success"], ordered=True, regex=True) t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${LCREALM} -k yes", ["INBOUND NEIGHBORS", - "${BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${BASEDN}", - "Last attempt .* was successful", - "OUTBOUND NEIGHBORS", - "${BASEDN}", - "Last success", - "CN=Configuration,${BASEDN}", - "Last success", - "CN=Configuration,${BASEDN}", - "Last success"], + "${BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${BASEDN}", + "Last attempt .* was successful", + "OUTBOUND NEIGHBORS", + "${BASEDN}", + "Last success", + "CN=Configuration,${BASEDN}", + "Last success", + "CN=Configuration,${BASEDN}", + "Last success"], ordered=True, regex=True) @@ -382,13 +382,13 @@ def test_dcpromo_rodc(t, vm): t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM}", ["INBOUND NEIGHBORS", - "OUTBOUND NEIGHBORS", - "${BASEDN}", - "Last attempt.*was successful", - "CN=Configuration,${BASEDN}", - "Last attempt.*was successful", - "CN=Configuration,${BASEDN}", - "Last attempt.*was successful"], + "OUTBOUND NEIGHBORS", + "${BASEDN}", + "Last attempt.*was successful", + "CN=Configuration,${BASEDN}", + "Last attempt.*was successful", + "CN=Configuration,${BASEDN}", + "Last attempt.*was successful"], ordered=True, regex=True) @@ -537,13 +537,13 @@ def test_join_as_rodc(t, vm): t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${WIN_REALM} -k yes", ["INBOUND NEIGHBORS", - "OUTBOUND NEIGHBORS", - "${WIN_BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${WIN_BASEDN}", - "Last attempt .* was successful", - "CN=Configuration,${WIN_BASEDN}", - "Last attempt .* was successful"], + "OUTBOUND NEIGHBORS", + "${WIN_BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${WIN_BASEDN}", + "Last attempt .* was successful", + "CN=Configuration,${WIN_BASEDN}", + "Last attempt .* was successful"], ordered=True, regex=True) |