samba-tool rodc: consistently use self.outf, not stdout

This increases the output of some commands from the point of view of
tests which read the outf, so we also need to change those tests a
bit.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
index 41a7a85b7125f07d42e2b4f1bcc14d763176cf2e..533f9446a091b8bae72eb6ab3459dce07b80b87c 100644 (file)
--- a/python/samba/netcmd/rodc.py
+++ b/python/samba/netcmd/rodc.py
@@ -149,9 +149,9 @@ class cmd_rodc_preload(Command):
             local_samdb.transaction_commit()
 
         if len(errors) > 0:
-            print "\nPreload encountered problematic users:"
+            self.message("\nPreload encountered problematic users:")
             for error in errors:
-                print "    %s" % error
+                self.message("    %s" % error)
 
 
 class cmd_rodc(SuperCommand):

diff --git a/python/samba/tests/samba_tool/rodc.py b/python/samba/tests/samba_tool/rodc.py
index 4851a53910a81c6aeb01b029085c58647cdc230b..870b5d4339eb2955914ed9a9e008b2af4c94e907 100644 (file)
--- a/python/samba/tests/samba_tool/rodc.py
+++ b/python/samba/tests/samba_tool/rodc.py
@@ -104,7 +104,8 @@ class RodcCmdTestCase(SambaToolCmdTest):
                                             "--server", os.environ["DC_SERVER"],
                                             "--ignore-errors")
         self.assertCmdSuccess(result, out, err, "ensuring rodc prefetch ran successfully")
-        self.assertEqual(out, "Replicating DN CN=sambatool5,CN=Users,%s\n" % self.base_dn)
+        self.assertTrue(out.startswith("Replicating DN CN=sambatool5,CN=Users,%s\n"
+                                       % self.base_dn))
 
     def test_multi_with_missing_name_failure(self):
         (result, out, err) = self.runsubcmd("rodc", "preload",
@@ -119,7 +120,9 @@ class RodcCmdTestCase(SambaToolCmdTest):
                                             "--server", os.environ["DC_SERVER"],
                                             "--ignore-errors")
         self.assertCmdSuccess(result, out, err, "ensuring rodc prefetch ran successfully")
-        self.assertEqual(out, "Replicating DN CN=sambatool6,CN=Users,%s\nReplicating DN CN=sambatool5,CN=Users,%s\n" % (self.base_dn, self.base_dn))
+        self.assertTrue(out.startswith("Replicating DN CN=sambatool6,CN=Users,%s\n"
+                                       "Replicating DN CN=sambatool5,CN=Users,%s\n"
+                                       % (self.base_dn, self.base_dn)))
 
     def test_multi_without_group_failure(self):
         (result, out, err) = self.runsubcmd("rodc", "preload",