More changes for test failures

OpenLiberty · Oct 1, 2023 · 9776bcd · 9776bcd
1 parent f250327
commit 9776bcd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/it/tests/basic-it/windows/build.xml b/src/it/tests/basic-it/windows/build.xml
@@ -13,13 +13,12 @@
     <property name="wlp.usr.dir" value="${target.dir}/wlp_usr" />
     <property name="wlp.output.dir" value="${target.dir}/wlp_output" />
     <property name="servername" value="basic" />
-    <property name="cacheDir" value="${target.dir}/wlp-cache" />
 
     <property name="serverConfig" value="${basedir}/src/test/resources/server.xml" />
     <property name="bootProp" value="${basedir}/src/test/resources/bootstrap.properties" />
 
     <target name="installServer">
-        <wlp:install-liberty licenseCode="${wlp.license}" version="${wlp.version}" basedir="${target.dir}"  cacheDir="${cacheDir}" />
+        <wlp:install-liberty licenseCode="${wlp.license}" version="${wlp.version}" basedir="${target.dir}" />
     </target>
 
     <target name="createServer">

diff --git a/src/it/tests/deploy-eba-it/windows/build.xml b/src/it/tests/deploy-eba-it/windows/build.xml
@@ -33,7 +33,7 @@
 
         <wlp:server ref="testServer" operation="stop" />
 
-        <wlp:clean ref="testServer" apps="true" dropins="true"  logs="false"/>
+        <wlp:clean ref="testServer" apps="true" dropins="true"  logs="false" workarea="false" />
 
     </target>
 

diff --git a/src/it/tests/install-server-it/build.xml b/src/it/tests/install-server-it/build.xml
@@ -13,10 +13,9 @@
     <property name="wlp.usr.dir" value="${target.dir}/wlp_usr" />
     <property name="wlp.output.dir" value="${target.dir}/wlp_output" />
     <property name="servername" value="wlp.ant.test" />
-    <property name="cacheDir" value="${target.dir}/wlp-cache" />
 
     <target name="installServer">
-        <wlp:install-liberty licenseCode="${wlpLicense}" version="${wlpVersion}" basedir="${target.dir}" type="kernel" cacheDir="${cacheDir}" />
+        <wlp:install-liberty licenseCode="${wlpLicense}" version="${wlpVersion}" basedir="${target.dir}" type="kernel" />
 
         <delete dir="${wlp.usr.dir}" />
         <delete dir="${wlp.output.dir}" />

diff --git a/src/main/java/io/openliberty/tools/ant/install/InstallLibertyTask.java b/src/main/java/io/openliberty/tools/ant/install/InstallLibertyTask.java
@@ -35,7 +35,7 @@ public class InstallLibertyTask extends AbstractTask {
 
     private String baseDir;
     private String cacheDir;
-    private boolean verbose=true;
+    private boolean verbose;
     private String licenseCode;
     private String version;
     private String type;
@@ -125,9 +125,7 @@ private void onlineDownload(URL source, File dest, boolean skipExisting) throws
         }
         if (skipExisting) {
             get.setSkipExisting(true);
-        } //else {
-          //  get.setUseTimestamp(true);
-        //}
+        }
         get.setUsername(username);
         get.setPassword(password);
         get.setMaxTime(maxDownloadTime);