[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Ovirt-devel] [PATCH] test updates incorporating new auth changes



The included patch switches the appliance into the test environment
before running the wui tests, and removed the now-unnecessary url based
credentials.

   -Mo
>From 1c34a258e617615f8211a12312057daa2cfc14dd Mon Sep 17 00:00:00 2001
From: root <root llama lab bos redhat com>
Date: Fri, 15 Aug 2008 15:06:28 -0400
Subject: [PATCH] changes to autobuild / interface test incorporating new auth changes

---
 autobuild.sh                              |   11 ++++-------
 wui/src/test/functional/interface_test.rb |    5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index b565404..64b48a7 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -74,13 +74,10 @@ else
   echo "$SELENIUM_RB not found, will not run interface tests"
 fi
 
-$ssh_cmd \
-  "sed -i -e \"s/KrbMethodNegotiate on/KrbMethodNegotiate off/g\" \
-          -e \"s/KrbMethodK5Passwd off/KrbMethodK5Passwd on/g\" \
-          /etc/httpd/conf.d/ovirt-wui.conf"
-
 echo "Running the wui tests"
 $ssh_cmd \
-    "curl -i --negotiate -u : management.priv.ovirt.org/ovirt/ | \
+  "sed -i \"s/#RAILS_ENV=production/RAILS_ENV=test/g\" /etc/sysconfig/ovirt-rails && \
+   service ovirt-mongrel-rails restart && service httpd restart && \
+   curl -i http://management.priv.ovirt.org/ovirt/ | \
        grep 'HTTP/1.1 200 OK' && \
-     cd /usr/share/ovirt-wui && rake test"
+   cd /usr/share/ovirt-wui && rake test"
diff --git a/wui/src/test/functional/interface_test.rb b/wui/src/test/functional/interface_test.rb
index d37a716..6563b44 100644
--- a/wui/src/test/functional/interface_test.rb
+++ b/wui/src/test/functional/interface_test.rb
@@ -25,13 +25,14 @@ if File.exists? File.dirname(__FILE__) + '/../selenium.rb'
          def setup
             @browser = Selenium::SeleniumDriver.new("192.168.50.1", 4444,
                            "*firefox /usr/lib64/firefox-3.0.1/firefox",
-                           "http://admin:ovirt 192 168 50 2/ovirt/", 15000)
+                           "http://192.168.50.2/ovirt/";, 15000)
             @browser.start
          end
 
          def test_ovirt
-            @browser.open("http://admin:ovirt 192 168 50 2/ovirt/")
+            @browser.open("http://192.168.50.2/ovirt/";)
             assert_equal("Dashboard", @browser.get_title())
+	    @browser.close
          end
 
          def teardown
-- 
1.5.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]