From 013c86de30896abc3697ceccce34f2728d94c1cc Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 26 Sep 2012 06:31:29 +0000
Subject: [PATCH] SWE-2 / SP-263: Fix Hudson run
SVN: 26809
---
ui-test/build/build.xml | 10 +++++++---
.../cisd/openbis/uitest/suite/SeleniumTest.java | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ui-test/build/build.xml b/ui-test/build/build.xml
index a389618f942..b31c7233027 100644
--- a/ui-test/build/build.xml
+++ b/ui-test/build/build.xml
@@ -27,8 +27,11 @@
<target name="_run-testng-ui">
- <condition property="internal-url" value="${ui-test.url}" else="">
- <isset property="ui-test.url"/>
+ <condition property="internal-as-url" value="${ui-test.as-url}" else="">
+ <isset property="ui-test.as-url"/>
+ </condition>
+ <condition property="internal-dss-url" value="${ui-test.dss-url}" else="">
+ <isset property="ui-test.dss-url"/>
</condition>
<testng classpath="${ecp}"
@@ -38,7 +41,8 @@
<xmlfileset dir="source/java" includes="${test.suite}" />
<jvmarg value="-Xmx1024M" />
<jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-Dui-test.url=${internal-url}" />
+ <jvmarg value="-Dui-test.as-url=${internal-as-url}" />
+ <jvmarg value="-Dui-test.dss-url=${internal-dss-url}" />
</testng>
<fail if="${failure.property}" />
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SeleniumTest.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SeleniumTest.java
index 72d23ca7607..4f3aab55da1 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SeleniumTest.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SeleniumTest.java
@@ -130,6 +130,10 @@ public abstract class SeleniumTest
dssUrl = "http://localhost:8889";
}
+ System.out.println("asUrl: " + asUrl);
+ System.out.println("dssUrl: " + dssUrl);
+ System.out.println("startPage: " + startPage);
+
driver = new FirefoxDriver();
setImplicitWaitToDefault();
delete(new File("targets/dist"));
--
GitLab