diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/unittest/test_client.py | 5 | ||||
| -rw-r--r-- | test/unittest/test_func_transmit.py | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/test/unittest/test_client.py b/test/unittest/test_client.py index 4734093..d1b37a5 100644 --- a/test/unittest/test_client.py +++ b/test/unittest/test_client.py @@ -170,6 +170,11 @@ class TestCommand(BaseTest): assert result[self.th][1].split("-")[0] == "filesystem" + def test_env(self): + result = self.overlord.command.run("env", + {'BLIPPYFOO':'awesome'}) + self.assert_on_fault(result) + assert result[self.th][1].strip() == "BLIPPYFOO=awesome" class TestCopyfile(BaseTest): fn = "/tmp/func_test_file" diff --git a/test/unittest/test_func_transmit.py b/test/unittest/test_func_transmit.py index b091148..6fbdd76 100644 --- a/test/unittest/test_func_transmit.py +++ b/test/unittest/test_func_transmit.py @@ -92,6 +92,7 @@ class BaseTest(object): # we do this all over the place... def assert_on_fault(self, result): + print "\n\n", result, "\n\n\n" assert func.utils.is_error(result[self.th]) == False # assert type(result[self.th]) != xmlrpclib.Fault @@ -122,19 +123,23 @@ class ListMinion(object): def test_list_minions(self): out = self.call({'clients': '*', - 'method': 'list_minions'}) + 'module':'local', + 'method': 'utils.list_minions'}) def test_list_minions_no_match(self): out = self.call({'clients': 'somerandom-name-that-shouldnt-be-a_real_host_name', - 'method': 'list_minions'}) + 'module':'local', + 'method':'utils.list_minions'}) assert out == [] def test_list_minions_group_name(self): out = self.call({'clients': '@test', - 'method': 'list_minions'}) + 'module':'local', + 'method': 'local.utils.list_minions'}) def test_list_minions_no_clients(self): - out = self.call({'method': 'list_minions'}) + out = self.call({'module':'local', + 'method': 'utils.list_minions'}) class ListMinionAsync(ListMinion): |