fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'telmich/master'

Browse source 
Conflicts:
	lib/cdist/emulator.py
This commit is contained in:
Steven Armstrong 2011-10-11 12:40:44 +02:00
commit 405ebbccb7
12 changed files with 221 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/cdist/test/__init__.py
View file

@ -30,9 +30,6 @@ cdist_commands=["banner", "config", "install"]
cdist_exec_path = os.path.abspath(
os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../bin/cdist"))
def exec():
print(cdist_exec_path)
#class UI(unittest.TestCase):
# def test_banner(self):
# self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)

12
lib/cdist/test/test_install.py
View file

@ -29,20 +29,22 @@ sys.path.insert(0, os.path.abspath(
os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
import cdist.config
cdist_exec_path = os.path.abspath(
os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin/cdist"))
import cdist.test
class Install(unittest.TestCase):
def setUp(self):
self.temp_dir = tempfile.mkdtemp()
self.init_manifest = os.path.join(self.temp_dir, "manifest")
os.environ['__remote_exec'] = "ssh -o User=root -q"
os.environ['__remote_copy'] = "scp -o User=root -q"
self.config = cdist.config.Config("localhost",
initial_manifest=self.init_manifest,
exec_path=cdist_exec_path)
exec_path=cdist.test.cdist_exec_path)
self.config.link_emulator()
### NEW FOR INSTALL ############################################################
def test_explorer_ran(self):