]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4/tests/samba-tool drs showrepl: use vars for common strings
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 17 Aug 2022 02:26:29 +0000 (14:26 +1200)
committerDouglas Bagnall <dbagnall@samba.org>
Tue, 6 Sep 2022 21:12:36 +0000 (21:12 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
source4/torture/drs/python/samba_tool_drs_showrepl.py

index 707b1fb3a7577f40590d688ab586c8358b5feec4..896459310708ed4e35c5f70901614692c1701f5a 100644 (file)
@@ -229,35 +229,39 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
         self._enable_all_repl(self.dc1)
         self._force_all_reps(samdb1, self.dc1, 'inbound')
         self._force_all_reps(samdb1, self.dc1, 'outbound')
+        all_good_green = "\033[1;32m[ALL GOOD]\033[0m\n"
+        all_good = "[ALL GOOD]\n"
+
         try:
             out = self.check_output(
                 "samba-tool drs showrepl --pull-summary %s %s" %
                 (self.dc1, self.cmdline_creds))
             out = get_string(out)
-            self.assertStringsEqual(out, "[ALL GOOD]\n")
+            self.assertStringsEqual(out, all_good)
             out = get_string(out)
 
             out = self.check_output("samba-tool drs showrepl --pull-summary "
                                     "--color=yes %s %s" %
                                     (self.dc1, self.cmdline_creds))
             out = get_string(out)
-            self.assertStringsEqual(out, "\033[1;32m[ALL GOOD]\033[0m\n")
+            self.assertStringsEqual(out, all_good_green)
 
             # --verbose output is still quiet when all is good.
             out = self.check_output(
                 "samba-tool drs showrepl --pull-summary -v %s %s" %
                 (self.dc1, self.cmdline_creds))
             out = get_string(out)
-            self.assertStringsEqual(out, "[ALL GOOD]\n")
+            self.assertStringsEqual(out, all_good)
+
             out = self.check_output("samba-tool drs showrepl --pull-summary -v "
                                     "--color=yes %s %s" %
                                     (self.dc1, self.cmdline_creds))
             out = get_string(out)
+            self.assertStringsEqual(out, all_good_green)
 
         except samba.tests.BlackboxProcessError as e:
             self.fail(str(e))
 
-        self.assertStringsEqual(out, "\033[1;32m[ALL GOOD]\033[0m\n")
 
     def test_samba_tool_showrepl_summary_forced_failure(self):
         """Tests 'samba-tool drs showrepl --summary' command when we break the