summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-07-14 16:10:20 +0000
committerBill Peck <bpeck@redhat.com>2009-07-14 16:10:20 +0000
commit1aa550326fb5def2e8fee1af1780463e57467a19 (patch)
tree553900b760e589c0617c1b35fc2a9bbca6e4239c
parentcec2da06767e026697a3048df03841704cde61fc (diff)
we verify the distros in legacy-rhts testsrh-tests-distribution-beaker-setup-1_1-17
-rw-r--r--Tasks/distribution/beaker/setup/Makefile2
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh12
-rwxr-xr-xTasks/distribution/beaker/setup/verify_distro.py43
3 files changed, 1 insertions, 56 deletions
diff --git a/Tasks/distribution/beaker/setup/Makefile b/Tasks/distribution/beaker/setup/Makefile
index 51dbab7..39ac24a 100644
--- a/Tasks/distribution/beaker/setup/Makefile
+++ b/Tasks/distribution/beaker/setup/Makefile
@@ -43,7 +43,7 @@ export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
BUILT_FILES=
# data files, .c files, scripts anything needed to either compile the test and/or run it.
-FILES=$(METADATA) runtest.sh Makefile PURPOSE add_labcontroller.py verify_distro.py
+FILES=$(METADATA) runtest.sh Makefile PURPOSE add_labcontroller.py
run: $(FILES) build
./runtest.sh
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 7aeb5f8..72437ae 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -345,18 +345,6 @@ function LabController()
fi
/var/lib/cobbler/triggers/sync/post/osversion.trigger | tee -a $OUTPUTFILE
estatus_fail "**** Failed to run osversion.trigger ****"
- for distro in $NFSDISTROS; do
- DISTRONAME=$(echo $distro| awk -F: '{print $2}')
- FAMILY=$(echo $distro| awk -F: '{print $4}')
- UPDATE=$(echo $distro| awk -F: '{print $5}')
- ./verify_distro.py -d $DISTRONAME -f $FAMILY -u $UPDATE -s $SERVER
- rc=$?
- if [ $rc -ne 0 ]; then
- report_result $TEST/VERIFY_DISTRO/$DISTRONAME FAIL $rc
- else
- report_result $TEST/VERIFY_DISTRO/$DISTRONAME PASS $rc
- fi
- done
rhts-sync-set -s DONE
result_pass
}
diff --git a/Tasks/distribution/beaker/setup/verify_distro.py b/Tasks/distribution/beaker/setup/verify_distro.py
deleted file mode 100755
index f9cbc8e..0000000
--- a/Tasks/distribution/beaker/setup/verify_distro.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/python
-
-import sys, getopt
-from twill.commands import *
-
-USAGE_TEXT = """
-Usage: verify_distro.py -s Inventory -d distro_name -f family -u update
-"""
-def usage():
- print USAGE_TEXT
- sys.exit(-1)
-
-server = None
-args = sys.argv[1:]
-try:
- opts, args = getopt.getopt(args, 's:d:f:u:', ['server='])
-except:
- usage()
-
-for opt, val in opts:
- if opt in ('-s', '--server'):
- server = val
- if opt in ('-d'):
- distro = val
- if opt in ('-f'):
- family = val
- if opt in ('-u'):
- update = val
-
-if not server:
- usage()
-
-# login
-go("https://%s/login" % server)
-formclear(1)
-fv("1","user_name","admin")
-fv("1","password","testing")
-submit('login')
-
-# Verify Added Distros
-go("/distros/?name=%s" % distro)
-code(200)
-find("%s.*</td>.*<td>.*redhat.*</td>.*<td>.*%s.*</td>.*<td>.*%s" % (distro, family, update))