forked from ungleich-public/cdist
		
	merge resolver test into object test - because object requirement solving is implemented
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								cd8b3cf68d
							
						
					
				
			
			
				commit
				
					
						442dc767dd
					
				
			
		
					 2 changed files with 91 additions and 88 deletions
				
			
		| 
						 | 
				
			
			@ -200,3 +200,94 @@ class ObjectTestCase(test.CdistTestCase):
 | 
			
		|||
        self.assertTrue(isinstance(other_object, core.CdistObject))
 | 
			
		||||
        self.assertEqual(other_object.cdist_type.name, '__first')
 | 
			
		||||
        self.assertEqual(other_object.object_id, 'man')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
#
 | 
			
		||||
# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import shutil
 | 
			
		||||
 | 
			
		||||
import cdist
 | 
			
		||||
from cdist import test
 | 
			
		||||
from cdist import core
 | 
			
		||||
 | 
			
		||||
import os.path as op
 | 
			
		||||
my_dir = op.abspath(op.dirname(__file__))
 | 
			
		||||
fixtures = op.join(my_dir, 'fixtures')
 | 
			
		||||
object_base_path = op.join(fixtures, 'object')
 | 
			
		||||
type_base_path = op.join(fixtures, 'type')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ResolverTestCase(test.CdistTestCase):
 | 
			
		||||
 | 
			
		||||
    def setUp(self):
 | 
			
		||||
        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)
 | 
			
		||||
 | 
			
		||||
        # Create a test object with requirements
 | 
			
		||||
        self.test_object = core.CdistObject(cdist_type, base_path, object_id=None)
 | 
			
		||||
 | 
			
		||||
    def tearDown(self):
 | 
			
		||||
        for o in self.objects:
 | 
			
		||||
            o.requirements = []
 | 
			
		||||
 | 
			
		||||
    def test_find_requirements_by_name_string(self):
 | 
			
		||||
        requirements = ['__first/man', '__second/on-the', '__third/moon']
 | 
			
		||||
        required_objects = [self.object_index[name] for name in requirements]
 | 
			
		||||
        self.assertEqual(sorted(list(self.dependency_resolver.find_requirements_by_name(requirements))),
 | 
			
		||||
            sorted(required_objects))
 | 
			
		||||
 | 
			
		||||
    def test_find_requirements_by_name_pattern(self):
 | 
			
		||||
        requirements = ['__first/*', '__second/*-the', '__third/moon']
 | 
			
		||||
        requirements_expanded = [
 | 
			
		||||
            '__first/child', '__first/dog', '__first/man', '__first/woman',
 | 
			
		||||
            '__second/on-the', '__second/under-the',
 | 
			
		||||
            '__third/moon'
 | 
			
		||||
        ]
 | 
			
		||||
        required_objects = [self.object_index[name] for name in requirements_expanded]
 | 
			
		||||
        self.assertEqual(sorted(list(self.dependency_resolver.find_requirements_by_name(requirements))),
 | 
			
		||||
            sorted(required_objects))
 | 
			
		||||
 | 
			
		||||
    def test_dependency_resolution(self):
 | 
			
		||||
        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.assertEqual(
 | 
			
		||||
            self.dependency_resolver.dependencies['__first/man'],
 | 
			
		||||
            [third_moon, second_on_the, first_man]
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    def test_circular_reference(self):
 | 
			
		||||
        first_man = self.object_index['__first/man']
 | 
			
		||||
        first_woman = self.object_index['__first/woman']
 | 
			
		||||
        first_man.requirements = [first_woman.name]
 | 
			
		||||
        first_woman.requirements = [first_man.name]
 | 
			
		||||
        with self.assertRaises(resolver.CircularReferenceError):
 | 
			
		||||
            self.dependency_resolver.dependencies
 | 
			
		||||
 | 
			
		||||
    def test_requirement_not_found(self):
 | 
			
		||||
        first_man = self.object_index['__first/man']
 | 
			
		||||
        first_man.requirements = ['__does/not/exist']
 | 
			
		||||
        with self.assertRaises(cdist.Error):
 | 
			
		||||
            self.dependency_resolver.dependencies
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,88 +0,0 @@
 | 
			
		|||
# -*- coding: utf-8 -*-
 | 
			
		||||
#
 | 
			
		||||
# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
 | 
			
		||||
#
 | 
			
		||||
# This file is part of cdist.
 | 
			
		||||
#
 | 
			
		||||
# cdist is free software: you can redistribute it and/or modify
 | 
			
		||||
# it under the terms of the GNU General Public License as published by
 | 
			
		||||
# the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
# (at your option) any later version.
 | 
			
		||||
#
 | 
			
		||||
# cdist is distributed in the hope that it will be useful,
 | 
			
		||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
# GNU General Public License for more details.
 | 
			
		||||
#
 | 
			
		||||
# You should have received a copy of the GNU General Public License
 | 
			
		||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import shutil
 | 
			
		||||
 | 
			
		||||
import cdist
 | 
			
		||||
from cdist import test
 | 
			
		||||
from cdist import core
 | 
			
		||||
from cdist import resolver
 | 
			
		||||
 | 
			
		||||
import os.path as op
 | 
			
		||||
my_dir = op.abspath(op.dirname(__file__))
 | 
			
		||||
fixtures = op.join(my_dir, 'fixtures')
 | 
			
		||||
object_base_path = op.join(fixtures, 'object')
 | 
			
		||||
type_base_path = op.join(fixtures, 'type')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ResolverTestCase(test.CdistTestCase):
 | 
			
		||||
 | 
			
		||||
    def setUp(self):
 | 
			
		||||
        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)
 | 
			
		||||
        self.dependency_resolver = resolver.DependencyResolver(self.objects)
 | 
			
		||||
 | 
			
		||||
    def tearDown(self):
 | 
			
		||||
        for o in self.objects:
 | 
			
		||||
            o.requirements = []
 | 
			
		||||
 | 
			
		||||
    def test_find_requirements_by_name_string(self):
 | 
			
		||||
        requirements = ['__first/man', '__second/on-the', '__third/moon']
 | 
			
		||||
        required_objects = [self.object_index[name] for name in requirements]
 | 
			
		||||
        self.assertEqual(sorted(list(self.dependency_resolver.find_requirements_by_name(requirements))),
 | 
			
		||||
            sorted(required_objects))
 | 
			
		||||
 | 
			
		||||
    def test_find_requirements_by_name_pattern(self):
 | 
			
		||||
        requirements = ['__first/*', '__second/*-the', '__third/moon']
 | 
			
		||||
        requirements_expanded = [
 | 
			
		||||
            '__first/child', '__first/dog', '__first/man', '__first/woman',
 | 
			
		||||
            '__second/on-the', '__second/under-the',
 | 
			
		||||
            '__third/moon'
 | 
			
		||||
        ]
 | 
			
		||||
        required_objects = [self.object_index[name] for name in requirements_expanded]
 | 
			
		||||
        self.assertEqual(sorted(list(self.dependency_resolver.find_requirements_by_name(requirements))),
 | 
			
		||||
            sorted(required_objects))
 | 
			
		||||
 | 
			
		||||
    def test_dependency_resolution(self):
 | 
			
		||||
        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.assertEqual(
 | 
			
		||||
            self.dependency_resolver.dependencies['__first/man'],
 | 
			
		||||
            [third_moon, second_on_the, first_man]
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    def test_circular_reference(self):
 | 
			
		||||
        first_man = self.object_index['__first/man']
 | 
			
		||||
        first_woman = self.object_index['__first/woman']
 | 
			
		||||
        first_man.requirements = [first_woman.name]
 | 
			
		||||
        first_woman.requirements = [first_man.name]
 | 
			
		||||
        with self.assertRaises(resolver.CircularReferenceError):
 | 
			
		||||
            self.dependency_resolver.dependencies
 | 
			
		||||
 | 
			
		||||
    def test_requirement_not_found(self):
 | 
			
		||||
        first_man = self.object_index['__first/man']
 | 
			
		||||
        first_man.requirements = ['__does/not/exist']
 | 
			
		||||
        with self.assertRaises(cdist.Error):
 | 
			
		||||
            self.dependency_resolver.dependencies
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue