Merge pull request #37 from astryia/fix_tests

Tests were fixed

Author: coderanger

chef/client.py

@@ -12,7 +12,7 @@ def _populate(self, data):
         if self.platform:
             self.orgname = data.get('orgname')
             self.validator = bool(data.get('validator', False))
-            self.public_key = data.get('certificate')
+            self.public_key = data.get('public_key')
             self.admin = False
         else:
             self.admin = bool(data.get('admin', False))
@@ -31,7 +31,7 @@ def to_dict(self):
             d.update({
                 'orgname': self.orgname,
                 'validator': self.validator,
-                'certificate': self.certificate,
+                'public_key': self.certificate,
                 'clientname': self.name,
             })
         else:
@@ -48,6 +48,7 @@ def create(cls, name, api=None, admin=False):
         obj.admin = admin
         d = api.api_request('POST', cls.url, data=obj)
         obj.private_key = d['private_key']
+        obj.public_key = d['public_key']
         return obj
 
     def rekey(self, api=None):

chef/tests/test_api.py

@@ -17,7 +17,7 @@ def test_basic(self):
     def test_current_dir(self):
         api = self.load('current_dir.rb')
         path = os.path.join(os.path.dirname(__file__), 'configs', 'test_1')
-        self.assertEqual(api.client, path)
+        self.assertEqual(os.path.normpath(api.client), path)
 
     def test_env_variables(self):
         try:

chef/tests/test_client.py

@@ -15,22 +15,21 @@ def test_get(self):
         self.assertTrue(client.certificate)
         self.assertEqual(client.private_key, None)
 
-    @unittest2.skip('Unknown failure, skipping until tomorrow morning <NPK 2012-03-22>')
     def test_create(self):
         name = self.random()
         client = Client.create(name)
         self.register(client)
         self.assertEqual(client.name, name)
         #self.assertEqual(client.orgname, 'pycheftest') # See CHEF-2019
         self.assertTrue(client.private_key)
-
+        self.assertTrue(client.public_key)
         self.assertIn(name, Client.list())
 
         client2 = Client(name)
         client2.rekey()
+        self.assertEqual(client.public_key, client2.public_key)
         self.assertNotEqual(client.private_key, client2.private_key)
 
-    @unittest2.skip('Unknown failure, skipping until tomorrow morning <NPK 2012-03-22>')
     def test_delete(self):
         name = self.random()
         client = Client.create(name)