ticket 1600 - convert unittests to use DN objects

We have a larger goal of replacing all DN creation via string
formatting/concatenation with DN object operations because string
operations are not a safe way to form a DN nor to compare a DN. This
work needs to be broken into smaller chunks for easier review and
testing.

Addressing the unit tests first makes sense because we don't want to
be modifying both the core code and the tests used to verify the core
code simultaneously. If we modify the unittests first with existing
core code and no regressions are found then we can move on to
modifying parts of the core code with the belief the unittests can
validate the changes in the core code. Also by doing the unittests
first we also help to validate the DN objects are working correctly
(although they do have an extensive unittest).

The fundamental changes are:

* replace string substitution & concatenation with DN object
  constructor

* when comparing dn's the comparision is done after promotion
  to a DN object, then two DN objects are compared

* when a list of string dn's are to be compared a new list is
  formed where each string dn is replaced by a DN object

* because the unittest framework accepts a complex data structure of
  expected values where dn's are represeted as strings the unittest
  needs to express the expected value of a dn as a callable object
  (e.g. a lambda expression) which promotes the dn string to a DN
  object in order to do the comparision.

1 files changed, 7 insertions, 6 deletions

diff --git a/tests/test_xmlrpc/test_cert.py b/tests/test_xmlrpc/test_cert.py
index c6d364a11..20aba1652 100644
--- a/tests/test_xmlrpc/test_cert.py
+++ b/tests/test_xmlrpc/test_cert.py
@@ -30,6 +30,7 @@ import tempfile
 from ipapython import ipautil
 import nose
 import base64
+from ipalib.dn import *
 
 # So we can save the cert from issuance and compare it later
 cert = None
@@ -92,7 +93,7 @@ class test_cert(XMLRPC_test):
     """
     host_fqdn = u'ipatestcert.%s' % api.env.domain
     service_princ = u'test/%s@%s' % (host_fqdn, api.env.realm)
-    subject = 'CN=%s,O=%s' % (host_fqdn, api.env.realm)
+    subject = DN(('CN',host_fqdn),('O',api.env.realm))
 
     def test_1_cert_add(self):
         """
@@ -103,7 +104,7 @@ class test_cert(XMLRPC_test):
         # First create the host that will use this policy
         res = api.Command['host_add'](self.host_fqdn, force= True)['result']
 
-        csr = unicode(self.generateCSR(self.subject))
+        csr = unicode(self.generateCSR(str(self.subject)))
         try:
             res = api.Command['cert_request'](csr, principal=self.service_princ)
             assert False
@@ -117,9 +118,9 @@ class test_cert(XMLRPC_test):
         # Our host should exist from previous test
         global cert
 
-        csr = unicode(self.generateCSR(self.subject))
+        csr = unicode(self.generateCSR(str(self.subject)))
         res = api.Command['cert_request'](csr, principal=self.service_princ, add=True)['result']
-        assert res['subject'] == self.subject
+        assert DN(res['subject']) == self.subject
         # save the cert for the service_show/find tests
         cert = res['certificate']
 
@@ -148,9 +149,9 @@ class test_cert(XMLRPC_test):
         """
         global newcert
 
-        csr = unicode(self.generateCSR(self.subject))
+        csr = unicode(self.generateCSR(str(self.subject)))
         res = api.Command['cert_request'](csr, principal=self.service_princ)['result']
-        assert res['subject'] == self.subject
+        assert DN(res['subject']) == self.subject
         # save the cert for the service_show/find tests
         newcert = res['certificate']