[PATCH 1/6] NetTestResultSerializer: fix seconds calculation for time remaining

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

When calculating the remaining seconds of the total test time I didn't
subtract seconds for the hours. This commit fixes that.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/NetTestResultSerializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Controller/NetTestResultSerializer.py
b/lnst/Controller/NetTestResultSerializer.py
index 62d4e43..4ac45dc 100644
--- a/lnst/Controller/NetTestResultSerializer.py
+++ b/lnst/Controller/NetTestResultSerializer.py
@@ -129,7 +129,7 @@ class NetTestResultSerializer:
         days = dif_time.days
         hours = dif_time.seconds/3600
         minutes = dif_time.seconds/60 - hours*60
-        seconds = dif_time.seconds - minutes*60
+        seconds = dif_time.seconds - hours*60 - minutes*60
         logging.info("Total test time: %d days, %d hours, %d minutes, "\
                      "%d seconds" % (days, hours, minutes, seconds))
 
-- 
2.1.0

[PATCH 2/6] lnst-ctl: add option --dump-config

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This commit adds a new option for the LNST controller - --dump-config.
When this option is specified, lnst-ctl will run until all configuration
files are loaded and then dump the resulting configuration on stdout.
This is useful for debugging purposes, or when including lnst in
scripts.

Since this commit the message "Loading config file ..." is printed on
stderr so that it doesn't get mixed with the dumped configuration.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst-ctl              | 10 ++++++++++
 lnst/Common/Config.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lnst-ctl b/lnst-ctl
index 128b6df..e715bb8 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -43,6 +43,8 @@ def usage(retval=0):
     print "  -a, --define-alias name=value   define top-level alias"
     print "  -c, --config=FILE               load additional config file"
     print "  -d, --debug                     emit debugging messages"
+    print "      --dump-config               dumps the join of all loaded " \
+              "configuration files on stdout and exits"
     print "  -h, --help                      print this message"
     print "  -m, --no-colours                disable coloured terminal output"
     print "  -o, --disable-pool-checks       don't check the availability of
" \
@@ -183,6 +185,7 @@ def main():
              "define_alias=",
              "config=",
              "debug",
+             "dump-config",
              "help",
              "no-colours",
              "disable-pool-checks",
@@ -231,6 +234,7 @@ def main():
     overriden_aliases = {}
     reduce_sync = False
     multi_match = False
+    dump_config = False
     for opt, arg in opts:
         if opt in ("-d", "--debug"):
             debug += 1
@@ -258,6 +262,8 @@ def main():
             xslt_url = arg
         elif opt in ("-u", "--multi-match"):
             multi_match = True
+        elif opt in ("--dump-config"):
+            dump_config = True
 
     if config_path is not None:
         if not os.path.isfile(config_path):
@@ -269,6 +275,10 @@ def main():
     if xslt_url != None:
         lnst_config.set_option("environment", "xslt_url", xslt_url)
 
+    if dump_config:
+        print lnst_config.dump_config()
+        return RETVAL_PASS
+
     if coloured_output:
         coloured_output = not lnst_config.get_option("colours",
                                                      "disable_colours")
diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py
index 2e982bf..f9c4b39 100644
--- a/lnst/Common/Config.py
+++ b/lnst/Common/Config.py
@@ -151,7 +151,7 @@ class Config():
         exp_path = os.path.expanduser(path)
         abs_path = os.path.abspath(exp_path)
         parser = ConfigParser(dict_type=dict)
-        print "Loading config file '%s'" % abs_path
+        print >> sys.stderr, "Loading config file '%s'" %
abs_path
         parser.read(abs_path)
 
         sections = parser._sections
-- 
2.1.0

[PATCH 3/6] lnst-ctl: accept multiple -c options

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The option -c (--config) can now be specified multiple times. This is
usefull when running lnst-ctl from a script.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst-ctl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lnst-ctl b/lnst-ctl
index e715bb8..9a321b6 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -226,7 +226,6 @@ def main():
     result_path = None
     html_result_path = None
     xslt_url = None
-    config_path = None
     packet_capture = False
     pool_checks = True
     coloured_output = True
@@ -241,7 +240,11 @@ def main():
         elif opt in ("-h", "--help"):
             usage(RETVAL_PASS)
         elif opt in ("-c", "--config"):
-            config_path = arg
+            if not os.path.isfile(arg):
+                print "File '%s' doesn't exist!" % arg
+                usage(RETVAL_ERR)
+            else:
+                lnst_config.load_config(arg)
         elif opt in ("-x", "--result"):
             result_path = arg
         elif opt in ("-t", "--html"):
@@ -265,12 +268,6 @@ def main():
         elif opt in ("--dump-config"):
             dump_config = True
 
-    if config_path is not None:
-        if not os.path.isfile(config_path):
-            print "File '%s' doesn't exist!" % config_path
-            usage(RETVAL_ERR)
-        else:
-            lnst_config.load_config(config_path)
 
     if xslt_url != None:
         lnst_config.set_option("environment", "xslt_url", xslt_url)
-- 
2.1.0

[PATCH 4/6] run-test: fix killing lnst-slaves after testing

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The if test was wrong so lnst-slave processes weren't being killed
properly.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 regression-tests/run-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 1c9c657..0ccb4db 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -219,7 +219,7 @@ print_separator
 sleep 1
 
 # Cleanup
-if [ $slave_status ]; then
+if [ -n "$slave_status" ]; then
     while read line; do
         hostname=`awk '{print $1}' <<<"$line"`
         pid=`awk '{print $2}' <<<"$line"`
-- 
2.1.0

[PATCH 5/6] regression-tests: don't use user conf by default

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This commit changes the default behaviour of running regression tests to
use the configuration present in the regression-tests/env/ directory -
this means that you need to properly create a pool in the env/pool/
directory before running these regression tests.

The option -c was added for situation when you want to use your own
local LNST configuration.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 regression-tests/run-test.sh  | 9 ++++++---
 regression-tests/tests/lib.sh | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 0ccb4db..400802e 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -41,7 +41,7 @@ function print_separator
 
 function usage
 {
-    echo "Usage: $0 [-r revision] [-l logdir] [-t list_of_tests] [-u url]
[-n]"
+    echo "Usage: $0 [-c] [-r revision] [-l logdir] [-t list_of_tests] [-u url]
[-n]"
     echo "    -r revision       Test a specific git branch/rev/tag"
     echo "                      Note: ignored when -s is used"
     echo "    -l logdir         Save test results to a directory"
@@ -52,6 +52,7 @@ function usage
     echo "    -u url            URL pointing to LNST repository that should be
used"
     echo "                      Note: git clone and checkout by default"
     echo "    -s                use rsync instead of git"
+    echo "    -c                use user configuration"
     exit 0
 }
 
@@ -60,10 +61,12 @@ function usage
 #default repository url
 url="../"
 use_git=true
+export use_user_conf="false"
 
-while getopts "hlr:t:g:ns" OPTION
+while getopts "chlr:t:g:ns" OPTION
 do
     case $OPTION in
+        c)  use_user_conf="true" ;;
         h)  usage ;;
         l)  log_dir_name="results-`date "+%Y-%m-%d-%I-%M-%S"`"
             mkdir -p $log_dir_name
@@ -93,7 +96,7 @@ fi
 echo "$$" >.lock
 
 # Clone the repo
-repo=`mktemp -d`
+export repo=`mktemp -d`
 if $use_git ; then
     git clone $url $repo
 else
diff --git a/regression-tests/tests/lib.sh b/regression-tests/tests/lib.sh
index df83ab1..5286534 100644
--- a/regression-tests/tests/lib.sh
+++ b/regression-tests/tests/lib.sh
@@ -56,3 +56,12 @@ function print_separator
 {
     echo
"--------------------------------------------------------------------------------"
 }
+
+function lnst-ctl
+{
+    if [ "$use_user_conf" = "true" ]; then
+        command lnst-ctl $@
+    else
+        command lnst-ctl -c $repo/lnst-ctl.conf $@
+    fi
+}
-- 
2.1.0

[PATCH 6/6] regression-tests: detect slave machines in nonstandard pool directories

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

You can now run regression tests without setting up your slave machines.
The run-test.sh script will detect what machine pools will lnst-ctl be
configured with and set them up automatically for you, before running
any tests.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 regression-tests/run-test.sh | 63 ++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/regression-tests/run-test.sh b/regression-tests/run-test.sh
index 400802e..329491e 100755
--- a/regression-tests/run-test.sh
+++ b/regression-tests/run-test.sh
@@ -56,6 +56,15 @@ function usage
     exit 0
 }
 
+function get_pool_dirs
+{
+    if [ "$use_user_conf" = "true" ]; then
+        command lnst-ctl --dump-config | grep 'machine_pool_dirs' | cut -d = -f2
+    else
+        command lnst-ctl -c $repo/lnst-ctl.conf --dump-config | grep
'machine_pool_dirs' | cut -d = -f2
+    fi
+}
+
 # ---
 
 #default repository url
@@ -121,38 +130,42 @@ fi
 #cp -r env ~/.lnst
 cp -r env/* $repo/
 
+pool_dirs=`PATH="$repo:$PATH" get_pool_dirs`
+
 # Scan the pool and prepare the machines in it
-for machine in `ls -1 env/pool/`; do
-    hostname=`get_hostname env/pool/$machine`
+for pool_dir in "$pool_dirs"; do
+    for machine in `ls -1 $pool_dir`; do
+        hostname=`get_hostname $pool_dir/$machine`
 
-    # In case this script was killed and there are any slave processes
-    # left hanging on the machine.
-    ssh "root@$hostname" 'for p in `pgrep lnst-slave`; do kill -9 $p;
done'
+        # In case this script was killed and there are any slave processes
+        # left hanging on the machine.
+        ssh "root@$hostname" 'for p in `pgrep lnst-slave`; do kill -9 $p;
done'
 
-    # Create a temporary dir for the git tree to be tested
-    remote_repo=`ssh "root@$hostname" "mktemp -d"`
+        # Create a temporary dir for the git tree to be tested
+        remote_repo=`ssh "root@$hostname" "mktemp -d"`
 
-    # Transfer the repo to the machine
-    rsync -r --exclude "Logs" --exclude ".git" "$repo/" \
-          "root@$hostname:$remote_repo"
+        # Transfer the repo to the machine
+        rsync -r --exclude "Logs" --exclude ".git" "$repo/"
\
+            "root@$hostname:$remote_repo"
 
-    if [ ! -z $nm_off ]; then
-        ssh "root@$hostname" "cd $remote_repo && echo
\"use_nm = false\" >> lnst-slave.conf"
-    fi
+        if [ ! -z $nm_off ]; then
+            ssh "root@$hostname" "cd $remote_repo && echo
\"use_nm = false\" >> lnst-slave.conf"
+        fi
 
-    # Start the slave process
-    ssh -n -t -t "root@$hostname" "cd $remote_repo &&
./lnst-slave" >/dev/null \
-        2>/dev/null &
-    pid=$!
+        # Start the slave process
+        ssh -n -t -t "root@$hostname" "cd $remote_repo &&
./lnst-slave" >/dev/null \
+            2>/dev/null &
+        pid=$!
 
-    # Save the status (hostname, pid of the ssh session, repo path)
-    # so we can cleanup things properly after the tests.
-    if [ -z "$slave_status" ]; then
-        slave_status="$hostname $pid $remote_repo"
-    else
-        slave_status="$hostname $pid $remote_repo
-                      $slave_status"
-    fi
+        # Save the status (hostname, pid of the ssh session, repo path)
+        # so we can cleanup things properly after the tests.
+        if [ -z "$slave_status" ]; then
+            slave_status="$hostname $pid $remote_repo"
+        else
+            slave_status="$hostname $pid $remote_repo
+            $slave_status"
+        fi
+    done
 done
 
 sleep 1
-- 
2.1.0

[Ondrej Lichtner]

jprochaz reported that it should be hours*3600
I also changed one of the commit headers related to regression-tests so
that it fits with the others
ignore this patchset, sending v2

On Fri, Feb 20, 2015 at 04:21:11PM +0100, olichtne(a)redhat.com wrote:
>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  
>  When calculating the remaining seconds of the total test time I didn't
>  subtract seconds for the hours. This commit fixes that.
>  
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/NetTestResultSerializer.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/lnst/Controller/NetTestResultSerializer.py
> b/lnst/Controller/NetTestResultSerializer.py
>  index 62d4e43..4ac45dc 100644
>  --- a/lnst/Controller/NetTestResultSerializer.py
>  +++ b/lnst/Controller/NetTestResultSerializer.py
>  @@ -129,7 +129,7 @@ class NetTestResultSerializer:
>           days = dif_time.days
>           hours = dif_time.seconds/3600
>           minutes = dif_time.seconds/60 - hours*60
>  -        seconds = dif_time.seconds - minutes*60
>  +        seconds = dif_time.seconds - hours*60 - minutes*60
>           logging.info("Total test time: %d days, %d hours, %d minutes, "\
>                        "%d seconds" % (days, hours, minutes, seconds))
>   
>  -- 
>  2.1.0
>