merge ResolverTestCase and AutorequireTestCase into ExecutionOrderTestCase

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

cdist/test/execution_order/__init__.py

@@ -39,22 +39,50 @@ type_base_path = op.join(fixtures, 'type')
 add_conf_dir = op.join(fixtures, 'conf')
 
 
-class ResolverTestCase(test.CdistTestCase):
-
+class ExecutionOrderTestCase(test.CdistTestCase):
     def setUp(self):
+        self.orig_environ = os.environ
+        os.environ = os.environ.copy()
+        self.temp_dir = self.mkdtemp()
+
+        self.out_dir = os.path.join(self.temp_dir, "out")
+        self.remote_out_dir = os.path.join(self.temp_dir, "remote")
+
+        os.environ['__cdist_out_dir'] = self.out_dir
+        os.environ['__cdist_remote_out_dir'] = self.remote_out_dir
+
+        self.context = cdist.context.Context(
+            target_host=self.target_host,
+            remote_copy=self.remote_copy,
+            remote_exec=self.remote_exec,
+            add_conf_dirs=[add_conf_dir],
+            exec_path=test.cdist_exec_path,
+            debug=False)
+
+        self.config = config.Config(self.context)
+
         self.objects = list(core.CdistObject.list_objects(object_base_path, type_base_path))
         self.object_index = dict((o.name, o) for o in self.objects)
 
     def tearDown(self):
+        os.environ = self.orig_environ
+        shutil.rmtree(self.temp_dir)
+
         for o in self.objects:
             o.requirements = []
 
     def test_dependency_resolution(self):
+        """Check that the runtime respects the right order"""
         first_man = self.object_index['__first/man']
         second_on_the = self.object_index['__second/on-the']
         third_moon = self.object_index['__third/moon']
+
         first_man.requirements = [second_on_the.name]
         second_on_the.requirements = [third_moon.name]
+
+        self.config.iterate_once()
+
+
         self.assertEqual(
             self.dependency_resolver.dependencies['__first/man'],
             [third_moon, second_on_the, first_man]
@@ -77,33 +105,6 @@ class ResolverTestCase(test.CdistTestCase):
             self.dependency_resolver.dependencies
         self.assertTrue(False)
 
-class AutorequireTestCase(test.CdistTestCase):
-
-    def setUp(self):
-        self.orig_environ = os.environ
-        os.environ = os.environ.copy()
-        self.temp_dir = self.mkdtemp()
-
-        self.out_dir = os.path.join(self.temp_dir, "out")
-        self.remote_out_dir = os.path.join(self.temp_dir, "remote")
-
-        os.environ['__cdist_out_dir'] = self.out_dir
-        os.environ['__cdist_remote_out_dir'] = self.remote_out_dir
-
-        self.context = cdist.context.Context(
-            target_host=self.target_host,
-            remote_copy=self.remote_copy,
-            remote_exec=self.remote_exec,
-            add_conf_dirs=[add_conf_dir],
-            exec_path=test.cdist_exec_path,
-            debug=False)
-
-        self.config = config.Config(self.context)
-
-    def tearDown(self):
-        os.environ = self.orig_environ
-        shutil.rmtree(self.temp_dir)
-
     def test_implicit_dependencies(self):
         self.context.initial_manifest = os.path.join(self.context.local.manifest_path, 'implicit_dependencies')
         self.config.stage_prepare()