From 136ddc05b59dc5cbe23f840dac7534a157778f73 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 28 Aug 2013 15:39:17 +0200 Subject: [PATCH] context based changes Signed-off-by: Nico Schottelius --- cdist/emulator.py | 2 +- cdist/exec/remote.py | 2 +- cdist/test/code/__init__.py | 6 +++++- cdist/test/emulator/__init__.py | 1 - cdist/test/explorer/__init__.py | 1 - 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cdist/emulator.py b/cdist/emulator.py index add20e70..26f551c6 100644 --- a/cdist/emulator.py +++ b/cdist/emulator.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) +# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org) # 2012 Steven Armstrong (steven-cdist at armstrong.cc) # # This file is part of cdist. diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py index 647474fa..469ec038 100644 --- a/cdist/exec/remote.py +++ b/cdist/exec/remote.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # 2011 Steven Armstrong (steven-cdist at armstrong.cc) -# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org) +# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # diff --git a/cdist/test/code/__init__.py b/cdist/test/code/__init__.py index 284ef9c0..f555023f 100644 --- a/cdist/test/code/__init__.py +++ b/cdist/test/code/__init__.py @@ -53,7 +53,11 @@ class CodeTestCase(test.CdistTestCase): self.remote_base_path = self.mkdtemp() remote_exec = self.remote_exec remote_copy = self.remote_copy - self.remote = remote.Remote(self.target_host, self.remote_base_path, remote_exec, remote_copy) + self.remote = remote.Remote( + target_host=self.target_host, + remote_exec=remote_exec, + remote_copy=remote_copy) + self.remote.base_path = self.remote_base_path self.remote.create_files_dirs() self.code = code.Code(self.target_host, self.local, self.remote) diff --git a/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py index ec0d7ae4..d68edd28 100644 --- a/cdist/test/emulator/__init__.py +++ b/cdist/test/emulator/__init__.py @@ -33,7 +33,6 @@ from cdist.exec import local from cdist import emulator from cdist import core from cdist import config -import cdist.context import os.path as op my_dir = op.abspath(op.dirname(__file__)) diff --git a/cdist/test/explorer/__init__.py b/cdist/test/explorer/__init__.py index a97b538a..8ded89b7 100644 --- a/cdist/test/explorer/__init__.py +++ b/cdist/test/explorer/__init__.py @@ -56,7 +56,6 @@ class ExplorerClassTestCase(test.CdistTestCase): self.remote = remote.Remote( self.target_host, - self.remote_base_path, self.remote_exec, self.remote_copy) self.remote.create_files_dirs()