Fix exec/{local,remote} tests. Add exec/local test to make test.

This commit is contained in:
Darko Poljak 2017-09-10 22:05:05 +02:00
commit 519eb60664
3 changed files with 22 additions and 5 deletions

View file

@ -22,8 +22,6 @@
import os
import getpass
import shutil
import string
import random
import multiprocessing
import cdist
@ -40,7 +38,8 @@ class RemoteTestCase(test.CdistTestCase):
'localhost',
'localhost',
)
self.base_path = self.temp_dir
# another temp dir for remote base path
self.base_path = self.mkdtemp()
user = getpass.getuser()
remote_exec = "ssh -o User=%s -q" % user
remote_copy = "scp -o User=%s -q" % user
@ -113,7 +112,8 @@ class RemoteTestCase(test.CdistTestCase):
os.close(handle)
target = self.mkdtemp(dir=self.temp_dir)
self.remote.transfer(source, target)
self.assertTrue(os.path.isfile(target))
self.assertTrue(os.path.isfile(
os.path.join(target, os.path.basename(source))))
def test_transfer_dir(self):
source = self.mkdtemp(dir=self.temp_dir)
@ -206,6 +206,7 @@ class RemoteTestCase(test.CdistTestCase):
output = r.run_script(script, env=env, return_output=True)
self.assertEqual(output, "test_object\n")
if __name__ == '__main__':
import unittest