From cb40c65f711ec7e7b414c263c4799ce7f82c5ede Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 23 Jan 2009 07:34:36 +0000
Subject: [PATCH] pass on slice & node tests - skip help programs - re-enable
 ping & synacks

---
 qaapi/qa/tests/node/AA-README.txt                 | 15 +++++++++++++++
 qaapi/qa/tests/node/{busyloop.py => _busyloop.py} |  0
 qaapi/qa/tests/node/node_cpu_sched.py             |  2 +-
 qaapi/qa/tests/node/{ping.pl.hide => ping.pl}     |  0
 .../qa/tests/node/{synacks.pl.hide => synacks.pl} |  0
 qaapi/qa/tests/node/util-vserver-enabled.help     |  1 +
 .../{baseconfig.py => util-vserver-enabled.py}    |  0
 qaapi/qa/tests/slice/AA-README.txt                | 15 +++++++++++++++
 system/utils.py                                   |  3 ++-
 9 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 qaapi/qa/tests/node/AA-README.txt
 rename qaapi/qa/tests/node/{busyloop.py => _busyloop.py} (100%)
 rename qaapi/qa/tests/node/{ping.pl.hide => ping.pl} (100%)
 rename qaapi/qa/tests/node/{synacks.pl.hide => synacks.pl} (100%)
 create mode 100644 qaapi/qa/tests/node/util-vserver-enabled.help
 rename qaapi/qa/tests/node/{baseconfig.py => util-vserver-enabled.py} (100%)
 create mode 100644 qaapi/qa/tests/slice/AA-README.txt

diff --git a/qaapi/qa/tests/node/AA-README.txt b/qaapi/qa/tests/node/AA-README.txt
new file mode 100644
index 0000000..33042d1
--- /dev/null
+++ b/qaapi/qa/tests/node/AA-README.txt
@@ -0,0 +1,15 @@
+All scripts in this directory that
+- start with a letter
+- end with .pl .py or .sh
+get triggered in the root context of a test node as part of the system/ test suite
+
+As far as possible, would you please 
+- pick up a meaningful name
+- and provide a corresponding .help file
+
+===
+The list of extensions that are considered (.pl .py or .sh) is defined
+in system/TestNode.py
+
+If for any reason a given script needs to be turned off, it is
+recommended to simply svn rename it and add '.hide' to its name
diff --git a/qaapi/qa/tests/node/busyloop.py b/qaapi/qa/tests/node/_busyloop.py
similarity index 100%
rename from qaapi/qa/tests/node/busyloop.py
rename to qaapi/qa/tests/node/_busyloop.py
diff --git a/qaapi/qa/tests/node/node_cpu_sched.py b/qaapi/qa/tests/node/node_cpu_sched.py
index cbb9663..fb39349 100755
--- a/qaapi/qa/tests/node/node_cpu_sched.py
+++ b/qaapi/qa/tests/node/node_cpu_sched.py
@@ -25,7 +25,7 @@ class Spinner(Thread):
     def __init__(self, test):
         Thread.__init__(self)
 
-        cmd = '/usr/bin/time ./busyloop.py 15'
+        cmd = '/usr/bin/time ./_busyloop.py 15'
         if test.share:
             flags = '--idle-time'
         else:
diff --git a/qaapi/qa/tests/node/ping.pl.hide b/qaapi/qa/tests/node/ping.pl
similarity index 100%
rename from qaapi/qa/tests/node/ping.pl.hide
rename to qaapi/qa/tests/node/ping.pl
diff --git a/qaapi/qa/tests/node/synacks.pl.hide b/qaapi/qa/tests/node/synacks.pl
similarity index 100%
rename from qaapi/qa/tests/node/synacks.pl.hide
rename to qaapi/qa/tests/node/synacks.pl
diff --git a/qaapi/qa/tests/node/util-vserver-enabled.help b/qaapi/qa/tests/node/util-vserver-enabled.help
new file mode 100644
index 0000000..4af3e30
--- /dev/null
+++ b/qaapi/qa/tests/node/util-vserver-enabled.help
@@ -0,0 +1 @@
+This script checks that util-vserver is configured to start with chkconfig
diff --git a/qaapi/qa/tests/node/baseconfig.py b/qaapi/qa/tests/node/util-vserver-enabled.py
similarity index 100%
rename from qaapi/qa/tests/node/baseconfig.py
rename to qaapi/qa/tests/node/util-vserver-enabled.py
diff --git a/qaapi/qa/tests/slice/AA-README.txt b/qaapi/qa/tests/slice/AA-README.txt
new file mode 100644
index 0000000..75cf3a7
--- /dev/null
+++ b/qaapi/qa/tests/slice/AA-README.txt
@@ -0,0 +1,15 @@
+All scripts in this directory that
+- start with a letter
+- end with .pl .py or .sh
+get triggered in a slice as part of the system/ test suite
+
+As far as possible, would you please 
+- pick up a meaningful name
+- and provide a corresponding .help file
+
+===
+The list of extensions that are considered (.pl .py or .sh) is defined
+in system/TestSliver.py
+
+If for any reason a given script needs to be turned off, it is
+recommended to simply svn rename it and add '.hide' to its name
diff --git a/system/utils.py b/system/utils.py
index df34cd9..ba1226a 100644
--- a/system/utils.py
+++ b/system/utils.py
@@ -55,7 +55,8 @@ def locate_sanity_scripts (message,path,extensions):
     print message,'searching',path,'for extensions',extensions
     scripts=[]
     for ext in extensions:
-        scripts += glob.glob (path+'/*.'+ext)
+        # skip helper programs
+        scripts += glob.glob (path+'/[a-zA-Z]*.'+ext)
     return scripts
     
 # quick & dirty - should probably use the parseroption object instead
-- 
2.47.0