[PATCHES] fix error messages

[Michael Adam]

Push/review appreciated.

Michael
-------------- next part --------------
From 3d2cc792af2e0f790e3b69e16eeef3d99edc18e7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 16 Mar 2015 18:40:53 +0100
Subject: [PATCH 1/2] dsdb: fix error message in sam test

Reviewed-by: Michael Adam <obnox at samba.org>
---
 source4/dsdb/tests/python/sam.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 620c96c..d5c27da 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -2906,7 +2906,7 @@ class SamTests(samba.tests.TestCase):
         actual_names = set(user_obj.keys())
         # Samba does not use 'dSCorePropagationData', so skip it
         actual_names -= set(['dSCorePropagationData'])
-        self.assertEqual(set(expected_attrs.keys()), actual_names, "Actual object does not has expected attributes")
+        self.assertEqual(set(expected_attrs.keys()), actual_names, "Actual object does not have expected attributes")
         # check attribute values
         for name in expected_attrs.keys():
             actual_val = user_obj.get(name)
-- 
2.1.0


From f04a6dab694a4b9c316ecf0a8205510367294526 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 16 Mar 2015 18:45:52 +0100
Subject: [PATCH 2/2] dsdb: fix error message in tombstone_reanimation test.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source4/dsdb/tests/python/tombstone_reanimation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py
index 6407279..ad780fd 100644
--- a/source4/dsdb/tests/python/tombstone_reanimation.py
+++ b/source4/dsdb/tests/python/tombstone_reanimation.py
@@ -83,7 +83,7 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase):
         return self.search_dn(msg['dn'])
 
     def assertAttributesEqual(self, obj_orig, attrs_orig, obj_restored, attrs_rest):
-        self.assertEqual(attrs_orig, attrs_rest, "Actual object does not has expected attributes")
+        self.assertEqual(attrs_orig, attrs_rest, "Actual object does not have expected attributes")
         # remove volatile attributes, they can't be equal
         attrs_orig -= set(["uSNChanged", "dSCorePropagationData", "whenChanged"])
         for attr in attrs_orig:
@@ -115,7 +115,7 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase):
         actual_names = set(obj_msg.keys())
         # Samba does not use 'dSCorePropagationData', so skip it
         actual_names -= set(['dSCorePropagationData'])
-        self.assertEqual(set(attr_expected.keys()), actual_names, "Actual object does not has expected attributes")
+        self.assertEqual(set(attr_expected.keys()), actual_names, "Actual object does not have expected attributes")
         for name in attr_expected.keys():
             expected_val = attr_expected[name]
             actual_val = obj_msg.get(name)
@@ -359,7 +359,7 @@ class RestoreUserObjectTestCase(RestoredObjectAttributesBaseTestCase):
         # windows restore more attributes that originally we have
         orig_attrs.update(['adminCount', 'operatorCount', 'lastKnownParent'])
         rest_attrs = set(obj_restore.keys())
-        self.assertEqual(orig_attrs, rest_attrs, "Actual object does not has expected attributes")
+        self.assertEqual(orig_attrs, rest_attrs, "Actual object does not have expected attributes")
         self.assertAttributesExists(self._expected_user_attributes(username, usr_dn, "Person"), obj_restore)
 
 
-- 
2.1.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150316/07285c84/attachment.pgp>