etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.6 to master 

* 4.6:
  Adapted HypervisorUtilsTest to no longer give false positives
This commit is contained in:
Remi Bergsma 2015-12-10 16:24:36 +01:00
parent 45f1e8d64f b14dfca82d
commit 312b9aff94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/src/test/java/org/apache/cloudstack/utils/hypervisor/HypervisorUtilsTest.java
View File

@ -42,9 +42,8 @@ public class HypervisorUtilsTest {
int timeoutSeconds = 5;
long thresholdMilliseconds = 2000;
File file = new File(filePath);
setupcheckVolumeFileForActivityFile(file, 0);
long startTime = System.currentTimeMillis();
long startTime = setupcheckVolumeFileForActivityFile(file, 0);
HypervisorUtils.checkVolumeFileForActivity(filePath, timeoutSeconds, thresholdMilliseconds, _minFileSize);
long endTime = System.currentTimeMillis();
@ -61,9 +60,8 @@ public class HypervisorUtilsTest {
int timeoutSeconds = 5;
long thresholdMilliseconds = 2000;
File file = new File(filePath);
setupcheckVolumeFileForActivityFile(file, _minFileSize);
long startTime = System.currentTimeMillis();
long startTime = setupcheckVolumeFileForActivityFile(file, _minFileSize);
HypervisorUtils.checkVolumeFileForActivity(filePath, timeoutSeconds, thresholdMilliseconds, _minFileSize);
long duration = System.currentTimeMillis() - startTime;
@ -93,7 +91,7 @@ public class HypervisorUtilsTest {
System.out.println("Fail");
}
private void setupcheckVolumeFileForActivityFile(File file, long minSize) throws IOException {
private long setupcheckVolumeFileForActivityFile(File file, long minSize) throws IOException {
if (file.exists()) {
file.delete();
}
@ -106,6 +104,8 @@ public class HypervisorUtilsTest {
writer.write(chars);
written += chars.length;
}
long creationTime = System.currentTimeMillis();
writer.close();
return creationTime;
}
}