From c43415e60f2f1ed4e45c8353a18c5153824e96b8 2017-08-21 13:04:42
From: Branko Majic <branko@majic.rs>
Date: 2017-08-21 13:04:42
Subject: [PATCH] MAR-123: Updated ldap_server test_user_supplied_entries to be robust to ordering changes.

---

diff --git a/roles/ldap_server/tests/test_optional.py b/roles/ldap_server/tests/test_optional.py
index ed073eeaca1c3aa4ccdac2acf5f0266d0c9b34f9..9b2332e7b9b8243e82e7fc3e8dac8fb22efd463d 100644
--- a/roles/ldap_server/tests/test_optional.py
+++ b/roles/ldap_server/tests/test_optional.py
@@ -186,20 +186,20 @@ def test_user_supplied_entries(Command, Sudo):
 
         john_doe = Command("ldapsearch -H ldapi:/// -Q -LLL -Y EXTERNAL -s base -b uid=john,dc=local")
         assert john_doe.rc == 0
-        assert john_doe.stdout == """dn: uid=john,dc=local
+        assert sorted(john_doe.stdout.split("\n")) == sorted("""dn: uid=john,dc=local
 objectClass: inetOrgPerson
 objectClass: simpleSecurityObject
 userPassword:: am9obnBhc3N3b3Jk
 cn: John Doe
 sn: Doe
-uid: john"""
+uid: john""".split("\n"))
 
         jane_doe = Command("ldapsearch -H ldapi:/// -Q -LLL -Y EXTERNAL -s base -b uid=jane,dc=local")
         assert jane_doe.rc == 0
-        assert jane_doe.stdout == """dn: uid=jane,dc=local
+        assert sorted(jane_doe.stdout.split("\n")) == sorted("""dn: uid=jane,dc=local
 objectClass: inetOrgPerson
 objectClass: simpleSecurityObject
 userPassword:: amFuZXBhc3N3b3Jk
 cn: Jane Doe
 sn: Doe
-uid: jane"""
+uid: jane""".split("\n"))