summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2011-08-04 09:59:13 +1000
committerGerrit Code Review <gerrit@beaker-gerrit.app.eng.bne.redhat.com>2011-08-04 09:59:13 +1000
commita5bdf262e2a34a2c44d84d1b885be6f5148f9225 (patch)
tree042bd657547b7f11844bfef4a48520fc01bc53c5
parent139e1e1d9ecf030bf8cc8ec18f67a5363f5c150c (diff)
parentc1cb0acaaedb32926d22e59b44ad2f77830cd8ef (diff)
Merge "use python-selenium package for selenium tests" into developbeaker-distribution-beaker-dogfood-1_1-27
-rw-r--r--Tasks/distribution/beaker/dogfood/Makefile5
-rw-r--r--beaker.spec1
2 files changed, 1 insertions, 5 deletions
diff --git a/Tasks/distribution/beaker/dogfood/Makefile b/Tasks/distribution/beaker/dogfood/Makefile
index 61f7667..c16db84 100644
--- a/Tasks/distribution/beaker/dogfood/Makefile
+++ b/Tasks/distribution/beaker/dogfood/Makefile
@@ -20,7 +20,6 @@ export TESTVERSION=1.1
export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
SELENIUM_SERVER_VERSION=1.0.3
-SELENIUM_PYTHON_VERSION=2.3.0
.PHONY: all install download clean
@@ -33,7 +32,6 @@ DOWNLOADED_FILES=selenium-remote-control-$(SELENIUM_SERVER_VERSION).zip
FILES=$(METADATA) runtest.sh Makefile PURPOSE
run: $(FILES) build \
- /usr/lib/python2.4/site-packages/selenium-$(SELENIUM_PYTHON_VERSION)-py2.4.egg \
/usr/local/share/selenium/selenium-server-$(SELENIUM_SERVER_VERSION)
./runtest.sh
@@ -51,9 +49,6 @@ clean:
/usr/local/share/selenium/selenium-server-$(SELENIUM_SERVER_VERSION): selenium-remote-control-$(SELENIUM_SERVER_VERSION).zip
unzip -o -d /usr/local/share/selenium $<
-/usr/lib/python2.4/site-packages/selenium-$(SELENIUM_PYTHON_VERSION)-py2.4.egg:
- easy_install 'selenium==$(SELENIUM_PYTHON_VERSION)'
-
# Include Common Makefile
include /usr/share/rhts/lib/rhts-make.include
diff --git a/beaker.spec b/beaker.spec
index aac8b0b..e193f83 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -85,6 +85,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-server = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
Requires: python-nose >= 0.10
+Requires: python-selenium >= 2.0
Requires: kobo
Requires: java-1.6.0-openjdk
Requires: Xvfb