Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/stress-smoke-bailout into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

If we want to bail early (even before the testing tool installation)
base on the requirement check in ubuntu_stress_smoke_test_checks.sh,
we need to move the test build process to a new build_source(), and
handle it just like a normal job in run_once().

This is because setup() will be triggered automatically right after
test execution before anything from run_once(). We can't skip it with
anything in run_once().

And it's not ideal to run the check in setup() before building the
test, firstly is because when you try to run the test again on the
same system, setup() won't be triggered unless the test version has
been bumped or the autotest/client/tmp/ubuntu_stress_smoke directory
has been removed. Secondly we might get confused when setup() fails.

Also fix a 'test_dir' is not defined issue.

[Francis Ginther (fginther)]

This appears to be overriding the default 'setup' with two manually specified setup routines. "setup_check" runs first to make sure this host is sufficient to run the test. Then "setup_init" runs to install and build stress-ng.

Looks good.

review: Approve

diff --git a/ubuntu_stress_smoke_test/control b/ubuntu_stress_smoke_test/control
index a610f6c..2867596 100644
--- a/ubuntu_stress_smoke_test/control
+++ b/ubuntu_stress_smoke_test/control
@@ -48,26 +48,26 @@ flavour = utils.system_output(cmd, retain_output=True)
 if flavour == 'kvm':
     exclude.append('dnotify')
 
-
-job.run_test_detail(NAME, test_name='setup-check' , tag='setup-check', timeout=5*60)
-
-job.run_test_detail(NAME, test_name='setup-init' , tag='setup-init', timeout=5*60)
-
-result = job.run_test_detail(NAME, test_name='setup', tag='setup', timeout=60*60)
+result = job.run_test_detail(NAME, test_name='setup-check', tag='setup-check', timeout=5*60)
 if result == 'GOOD':
-    stressng_dir = os.path.join(job.bindir, 'tmp', NAME, 'src', 'stress-ng')
-    cmd = '%s/stress-ng --stressor' % (stressng_dir)
-    stressors = utils.system_output(cmd, retain_output=True).split()
-else:
-    print("ERROR: can't get a list of available stressors")
-    exit(1)
+    job.run_test_detail(NAME, test_name='setup-init', tag='setup-init', timeout=5*60)
+    # Change the test build step from "setup" to "setup-test" so it won't get confused
+    # with the setup() that triggered automatically (which we intetionally left blank)
+    result = job.run_test_detail(NAME, test_name='setup-test', tag='setup-test', timeout=60*60)
+    if result == 'GOOD':
+        stressng_dir = os.path.join(job.bindir, 'tmp', NAME, 'src', 'stress-ng')
+        cmd = '%s/stress-ng --stressor' % (stressng_dir)
+        stressors = utils.system_output(cmd, retain_output=True).split()
+    else:
+        print("ERROR: can't get a list of available stressors")
+        exit(1)
 
-for stress in stressors:
-    if stress not in exclude:
-        job.run_test_detail(NAME, test_name=stress , tag=stress, timeout=35*60)
+    for stress in stressors:
+        if stress not in exclude:
+            job.run_test_detail(NAME, test_name=stress , tag=stress, timeout=35*60)
 
-src_dir = os.path.dirname(job.control)
-cmd = '%s/ubuntu_stress_smoke_test_cleanup.sh' % (src_dir)
-utils.system_output(cmd)
+    src_dir = os.path.dirname(job.control)
+    cmd = '%s/ubuntu_stress_smoke_test_cleanup.sh' % (src_dir)
+    utils.system_output(cmd)
 
 # vi:set ts=4 sw=4 expandtab syntax=python:
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
index 6fec4d2..12b29a2 100644
--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
@@ -47,9 +47,19 @@ class ubuntu_stress_smoke_test(test.test):
     def initialize(self):
         pass
 
+
     def setup(self):
-        self.install_required_pkgs()
-        self.job.require_gcc()
+        '''
+        We used to run code in build_source() here. Since we want to bail out early
+        if the requirement in ubuntu_stress_smoke_test_checks.sh does not met, we
+        can't build source here anymore. setup() will be triggered after initalize()
+        There is no chace to run check before setup(), this is an ugly hack we need
+        to keep until we have a better solution.
+        '''
+        pass
+
+
+    def build_source(self):
         os.chdir(self.srcdir)
         shutil.rmtree('stress-ng', ignore_errors=True)
         cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng'
@@ -75,8 +85,11 @@ class ubuntu_stress_smoke_test(test.test):
             nprocs = ''
         utils.make(nprocs)
 
+
     def run_once(self, test_name):
-        if test_name == 'setup':
+        if test_name == 'setup-test':
+            self.install_required_pkgs()
+            self.build_source()
             return
         elif test_name == 'setup-check':
             cmd = '%s/ubuntu_stress_smoke_test_checks.sh' % (self.bindir)