Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
581bbf3f
Commit
581bbf3f
authored
9 years ago
by
pkupczyk
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-2057 : Fix js-test - make symbolic links work again
SVN: 34218
parent
abcb847f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js-test/build.gradle
+1
-0
1 addition, 0 deletions
js-test/build.gradle
js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java
+9
-4
9 additions, 4 deletions
...isd/openbis/jstest/suite/common/JsTestCommonSelenium.java
with
10 additions
and
4 deletions
js-test/build.gradle
+
1
−
0
View file @
581bbf3f
...
...
@@ -62,6 +62,7 @@ test {
ignoreFailures
=
true
systemProperty
'selenium.dss-runtime-classpath'
,
configurations
.
externalDss
.
asPath
systemProperty
'jetty.home'
,
'../../../targets/gradle'
systemProperty
'jetty.base'
,
'../../../targets/gradle'
systemProperty
'ui-test.start-page'
,
'http://localhost:20000/openbis'
systemProperty
'org.mortbay.util.FileResource.checkAliases'
,
'false'
...
...
This diff is collapsed.
Click to expand it.
js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java
+
9
−
4
View file @
581bbf3f
...
...
@@ -38,12 +38,14 @@ import ch.systemsx.cisd.openbis.uitest.layout.Location;
*/
public
class
JsTestCommonSelenium
extends
SeleniumTest
{
private
void
createWebappLink
()
{
try
{
String
jettyHome
=
new
File
(
System
.
getProperty
(
"jetty.home"
)).
getAbsolutePath
();
new
File
(
jettyHome
+
"/webapps"
).
mkdirs
();
Unix
.
createSymbolicLink
(
jettyHome
+
"/webapps/webapp"
,
jettyHome
+
"/webapps/
openbis
"
);
Unix
.
createSymbolicLink
(
jettyHome
+
"/webapps/
openbis/
webapp"
,
jettyHome
+
"/webapps/
webapp/webapp
"
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -55,7 +57,9 @@ public class JsTestCommonSelenium extends SeleniumTest
{
JsTestCommonApplicationServer
as
=
new
JsTestCommonApplicationServer
();
as
.
setDeamon
(
true
);
return
as
.
start
();
String
result
=
as
.
start
();
createWebappLink
();
return
result
;
}
@Override
...
...
@@ -111,12 +115,13 @@ public class JsTestCommonSelenium extends SeleniumTest
try
{
OpenbisJsCommonWebapp
webapp
=
browser
().
goTo
(
location
);
String
junitReport
=
""
;
for
(
int
x
=
0
;
x
<
120
;
x
++)
{
junitReport
=
webapp
.
getJunitReport
();
if
(
junitReport
.
length
()
==
0
)
{
if
(
junitReport
.
length
()
==
0
)
{
try
{
System
.
out
.
println
(
"JUnit report is not there yet. Waiting..."
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment