From: Thierry Parmentelat Date: Mon, 21 Apr 2008 16:38:53 +0000 (+0000) Subject: default is now to use native packaging X-Git-Tag: tests-4.2-4~31 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c24a7092fb58cba01769a9978f0d279427274add;p=tests.git default is now to use native packaging --- diff --git a/system/TestMain.py b/system/TestMain.py index 59f2de2..3bc2113 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -84,10 +84,6 @@ steps refer to a method in TestPlc or to a step_* module help="Force the NM to restart in check_slices step") (self.options, self.args) = parser.parse_args() -# tmp : force small test -# utils.header("XXX WARNING : forcing small tests") -# self.options.small_test = True - if len(self.args) == 0: if self.options.all_steps: self.options.steps=TestPlc.default_steps diff --git a/system/config_default.py b/system/config_default.py index 2ca866a..0f2c849 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -1,9 +1,14 @@ # the defaults -# long story short, this does -# main (standard scenario), 1vnodes (map node(s) in the onelab pool) and then -# 1testbox32 or 64 depending on the personality option def config (plc_specs, options): + +# tmp : force small test + utils.header("XXX WARNING : forcing small tests in config_default") + self.options.small_test = True +# tmp : force vserver tests + utils.header("XXX WARNING : forcing native tests in config_default") + self.options.native = True + import config_main plcs = config_main.config([],options) import config_1vnodes