tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

almost finish correct requirement loading, but need sleep

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-15 02:54:54 +02:00
commit ee1c568c7b
2 changed files with 5 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/cdist/emulator.py
View file

@ -148,8 +148,12 @@ class Emulator(object):
if "require" in os.environ:
requirements = os.environ['require']
for requirement in requirements.split(" "):
self.log.debug("Recording requirement: " + requirement)
requirement_parts = requirement.split(os.sep, 1)
requirement_parts.reverse()
# FIXME: continue here
FAILHERE,PLEASE()[]!
print(requirement)
print(requirement_parts)
requirement_type_name = requirement_parts.pop()
try:
requirement_object_id = requirement_parts.pop()
@ -158,7 +162,6 @@ class Emulator(object):
requirement_object_id = 'singleton'
requirement_object_id = requirement_object_id.lstrip('/')
self.log.debug("Recording requirement: %s -> %s" % (self.cdist_object.path, requirement))
self.cdist_object.requirements.append(requirement)
# Record / Append source

79
other/tests_reintegrate/test_exec.py
View file

@ -1,79 +0,0 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
#
# 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 tempfile
import unittest
import cdist.exec
class ExecTestCase(unittest.TestCase):
def setUp(self):
"""Create shell code and co."""
self.temp_dir = tempfile.mkdtemp()
self.shell_false = os.path.join(self.temp_dir, "shell_false")
self.shell_true = os.path.join(self.temp_dir, "shell_true")
true_fd = open(self.shell_true, "w")
true_fd.writelines(["#!/bin/sh\n", "/bin/true"])
true_fd.close()
false_fd = open(self.shell_false, "w")
false_fd.writelines(["#!/bin/sh\n", "/bin/false"])
false_fd.close()
target_host = "does.not.exist"
remote_exec = "ssh -o User=root -q"
remote_copy = "scp -o User=root -q"
self.wrapper = cdist.exec.Wrapper(target_host, remote_exec, remote_copy)
def tearDown(self):
shutil.rmtree(self.temp_dir)
def test_local_success_shell(self):
try:
self.wrapper.shell_run_or_debug_fail(self.shell_true, [self.shell_true])
except cdist.Error:
failed = True
else:
failed = False
self.assertFalse(failed)
def test_local_fail_shell(self):
self.assertRaises(cdist.Error, self.wrapper.shell_run_or_debug_fail,
self.shell_false, [self.shell_false])
def test_local_success(self):
try:
self.wrapper.run_or_fail(["/bin/true"])
except cdist.Error:
failed = True
else:
failed = False
self.assertFalse(failed)
def test_local_fail(self):
self.assertRaises(cdist.Error, self.wrapper.run_or_fail, ["/bin/false"])