IcingaTemplateResolverTest: fix tests

This commit is contained in:
Thomas Gelf 2017-01-02 12:20:19 +01:00
parent 7ac0983229
commit 012b302386
1 changed files with 14 additions and 18 deletions

View File

@ -93,26 +93,27 @@ class IcingaTemplateResolverTest extends BaseTestCase
// 5, 6, 5, 5, 4, 3, 5, 6, 2, 1 // 5, 6, 5, 5, 4, 3, 5, 6, 2, 1
$prefix = $this->prefix; $t1 = $this->create('t1');
$t1 = $this->create($prefix . 't1'); $t4 = $this->create('t4');
$t4 = $this->create($prefix . 't4'); $t3 = $this->create('t3');
$t3 = $this->create($prefix . 't3'); $t2 = $this->create('t2');
$t2 = $this->create($prefix . 't2'); $t5 = $this->create('t5');
$t5 = $this->create($prefix . 't5'); $t6 = $this->create('t6');
$t6 = $this->create($prefix . 't6');
$t1->set('imports', array($prefix . 't6', $prefix . 't5', $prefix . 't2')); // TODO: Must work without this:
$t1->templateResolver()->clearCache();
$t1->set('imports', array($t6, $t5, $t2));
$t6->set('imports', array($t5)); $t6->set('imports', array($t5));
$t3->set('imports', array($t4)); $t3->set('imports', array($t4));
$t2->set('imports', array($t3, $t6)); $t2->set('imports', array($t3, $t6));
$t4->set('imports', array($t5)); $t4->set('imports', array($t5));
$t1->store();
$t2->store();
$t3->store();
$t4->store();
$t5->store(); $t5->store();
$t4->store();
$t3->store();
$t6->store(); $t6->store();
$t2->store();
$t1->store();
// TODO: Must work without this: // TODO: Must work without this:
$t1->templateResolver()->clearCache(); $t1->templateResolver()->clearCache();
@ -134,7 +135,7 @@ class IcingaTemplateResolverTest extends BaseTestCase
{ {
$host = IcingaHost::create( $host = IcingaHost::create(
array( array(
'object_name' => $name, 'object_name' => $this->prefixed($name),
'object_type' => 'template' 'object_type' => 'template'
) )
); );
@ -143,11 +144,6 @@ class IcingaTemplateResolverTest extends BaseTestCase
return $host; return $host;
} }
protected function loadRendered($name)
{
return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
}
public function tearDown() public function tearDown()
{ {
$db = $this->getDb(); $db = $this->getDb();