Commit db1cfda6 authored by Volker Hilsheimer's avatar Volker Hilsheimer
Browse files

Rename "test" job to "selftest"

parent 0713563d
module Test
module Selftest
def self.post_run(vm, *args)
vm.ui.info "Post-run for #{vm.name}"
end
......
module Test
module Selftest
def self.pre_run(vm, *args)
vm.ui.info "Pre-run for #{vm.name}"
end
......
......@@ -772,7 +772,7 @@ module Minicoin
begin
require "#{@job.path}/#{type}-run"
@job.log_verbose(@vm.ui, "Running #{type}-run ruby script for #{@job.name}")
eval("#{@job.name.gsub("-", "_").capitalize}::#{type}_run(@vm)")
eval("::#{@job.name.gsub("-", "_").capitalize}::#{type}_run(@vm)")
rescue LoadError => e
end
ext = Vagrant::Util::Platform.windows? ? "cmd" : "sh"
......
......@@ -9,14 +9,14 @@ settings:
no-hostname: true
jobconfigs: &testconfigs
- job: test
- job: selftest
name: simple
options:
param1: value1
param2: value2
flag:
- job: test
- job: selftest
name: complicated
options:
array1:
......@@ -25,7 +25,7 @@ jobconfigs: &testconfigs
spacey: foo bar
quoted: hello "world"
- job: test
- job: selftest
name: colored
options:
param1: text
......
......@@ -107,10 +107,10 @@ then
if [ $count -eq 0 ]; then
echo "No machines running, bring up test machines for more tests"
else
echo "Running test on $count machines in sequence"
echo "Running selftest on $count machines in sequence"
stdout=""
stderr=""
minicoin run --jobconfig 0 test ${machines[@]} -- error > .std.out 2> .std.err
minicoin run --jobconfig 0 selftest ${machines[@]} -- error > .std.out 2> .std.err
return=$?
stdout=`grep "Hello" .std.out`
......@@ -132,13 +132,13 @@ then
printf "${RED}Skipping advanced tests due to earlier errors${NOCOL}\n"
else
echo "Running test on $count machines in parallel"
minicoin run --parallel --jobconfig 0 test "${machines[@]}" > .std.out 2> .std.err
minicoin run --parallel --jobconfig 0 selftest "${machines[@]}" > .std.out 2> .std.err
return=$?
rm .std.out
rm .std.err
assert $return 0
minicoin run --parallel --jobconfig 0 test "${machines[@]}" -- error > .std.out 2> .std.err
minicoin run --parallel --jobconfig 0 selftest "${machines[@]}" -- error > .std.out 2> .std.err
return=$?
rm .std.out
rm .std.err
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment