From: Thierry Parmentelat Date: Wed, 17 Apr 2013 08:06:17 +0000 (+0200) Subject: Merge branch 'master' into sfa-geni-v3 X-Git-Tag: tests-5.3-1~11 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=07d6d9c2d137dcdc88b789b137d751501469d623;hp=-c;p=tests.git Merge branch 'master' into sfa-geni-v3 --- 07d6d9c2d137dcdc88b789b137d751501469d623 diff --combined system/TestPlc.py index 6eb2ac9,d3151ae..ef5fc7a --- a/system/TestPlc.py +++ b/system/TestPlc.py @@@ -97,7 -97,7 +97,7 @@@ class TestPlc 'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA, 'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA, 'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA, - 'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA, + 'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA, # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot # but as the stress test might take a while, we sometimes missed the debug mode.. 'ssh_node_debug@1', 'plcsh_stress_test@1', SEP, @@@ -189,7 -189,7 +189,7 @@@ return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host(),dry_run=self.options.dry_run)) def run_in_guest (self,command): - return utils.system(self.actual_command_in_guest(command),dry_run=self.options.dry_run) + return utils.system(self.actual_command_in_guest(command)) def run_in_host (self,command): return self.test_ssh.run_in_buildname(command, dry_run=self.options.dry_run) @@@ -1514,6 -1514,8 +1514,6 @@@ @auth_sfa_mapper def sfi_show(self): pass @auth_sfa_mapper - def sfi_slices(self): pass - @auth_sfa_mapper def ssh_slice_sfa(self): pass @auth_sfa_mapper def sfa_delete_user(self): pass