better debugging for wrong type, fix emulator tests, fixes #176

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

cdist/emulator.py

@@ -184,7 +184,12 @@ class Emulator(object):
                 if len(requirement) == 0: continue
 
                 # Raises an error, if object cannot be created
-                cdist_object = self.cdist_object.object_from_name(requirement)
+                try:
+                    cdist_object = self.cdist_object.object_from_name(requirement)
+                except core.cdist_type.NoSuchTypeError:
+                    self.log.error("%s requires object %s with non-existing type at %s"  % (self.cdist_object.name, requirement, self.object_source))
+                    raise
+
 
                 self.log.debug("Recording requirement: " + requirement)
 

cdist/test/emulator/__init__.py

@@ -63,13 +63,13 @@ class EmulatorTestCase(test.CdistTestCase):
 
     def test_nonexistent_type_exec(self):
         argv = ['__does-not-exist']
-        self.assertRaises(core.NoSuchTypeError, emulator.Emulator, argv, env=self.env)
+        self.assertRaises(core.cdist_type.NoSuchTypeError, emulator.Emulator, argv, env=self.env)
 
     def test_nonexistent_type_requirement(self):
         argv = ['__file', '/tmp/foobar']
         self.env['require'] = '__does-not-exist/some-id'
         emu = emulator.Emulator(argv, env=self.env)
-        self.assertRaises(core.NoSuchTypeError, emu.run)
+        self.assertRaises(core.cdist_type.NoSuchTypeError, emu.run)
 
     def test_illegal_object_id_requirement(self):
         argv = ['__file', '/tmp/foobar']
@@ -81,7 +81,7 @@ class EmulatorTestCase(test.CdistTestCase):
         argv = ['__file', '/tmp/foobar']
         self.env['require'] = '__file'
         emu = emulator.Emulator(argv, env=self.env)
-        self.assertRaises(core.IllegalObjectIdError, emu.run)
+        self.assertRaises(core.cdist_object.MissingObjectIdError, emu.run)
 
     def test_singleton_object_requirement(self):
         argv = ['__file', '/tmp/foobar']