performancecopilot · natoscott · Feb 18, 2020 · Jan 19, 2020 · Jan 19, 2020 · Jan 20, 2020
diff --git a/qa/1599 b/qa/1599
@@ -1,6 +1,6 @@
 #!/bin/sh
 # PCP QA Test No. 1599
-# Run each of the statsd PMDA ruby tests.
+# Run each of the statsd PMDA python tests.
 #
 # Copyright (c) 2019 Red Hat.
 #
@@ -9,14 +9,11 @@ seq=`basename $0`
 echo "QA output created by $seq"
 
 # get standard environment, filters and checks
-. ./common.product
-. ./common.filter
-. ./common.check
+. ./common.python
 
 test -e $PCP_PMDAS_DIR/statsd/pmdastatsd || _notrun "statsd PMDA not installed"
 
-# NOTE: Miroslav is planning to re-work this in python/shell
-which ruby >/dev/null 2>&1 || _notrun "ruby not installed"
+_check_valgrind
 
 _cleanup()
 {
@@ -28,41 +25,18 @@ status=1	# failure is the default!
 $sudo rm -rf $tmp $tmp.* $seq.full
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-pmdastatsd_remove()
-{
-    echo
-    echo "=== remove statsd agent ==="
-    cd $PCP_PMDAS_DIR/statsd
-    $sudo ./Remove >$tmp.out 2>&1
-    _filter_pmda_remove <$tmp.out
-}
-
-pmdastatsd_install()
-{
-    echo
-    echo "=== statsd agent installation ==="
-    cd $PCP_PMDAS_DIR/statsd
-    $sudo ./Install </dev/null >$tmp.out 2>&1
-    cat $tmp.out >>$here/$seq.full
-    _filter_pmda_install <$tmp.out
-}
-
 _prepare_pmda statsd
 # note: _restore_auto_restart pmcd done in _cleanup_pmda()
 trap "_cleanup_pmda statsd; exit \$status" 0 1 2 3 15
 _stop_auto_restart pmcd
 
-# real QA test starts here
-pmdastatsd_install
-
-cd $here/statsd
-scripts=`ls *.rb | LC_COLLATE=POSIX sort`
+cd $here/statsd/src
+scripts=`find cases -name *.py | LC_COLLATE=POSIX sort`
 for script in $scripts
 do
-    ruby $script
+    $python $script $here/statsd/output
 done
 cd $here
 
-pmdastatsd_remove
 status=0
 exit