git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
817c58f
)
JAL-4353 wait for files to be written fully before comparing size with older file
author
James Procter
<j.procter@dundee.ac.uk>
Tue, 12 Dec 2023 17:20:04 +0000
(17:20 +0000)
committer
James Procter
<j.procter@dundee.ac.uk>
Thu, 14 Dec 2023 15:32:43 +0000
(15:32 +0000)
test/jalview/bin/CommandsTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/bin/CommandsTest.java
b/test/jalview/bin/CommandsTest.java
index
2d54093
..
7b42737
100644
(file)
--- a/
test/jalview/bin/CommandsTest.java
+++ b/
test/jalview/bin/CommandsTest.java
@@
-191,13
+191,17
@@
public class CommandsTest
Assert.assertTrue(Files.size(file.toPath()) > 0, "File '" + filename
+ "' has no content from '" + cmdLine + "'");
// make sure the successive output files get bigger!
Assert.assertTrue(Files.size(file.toPath()) > 0, "File '" + filename
+ "' has no content from '" + cmdLine + "'");
// make sure the successive output files get bigger!
- if (lastFile != null) {
- Assert.assertTrue(Files.size(file.toPath()) > Files.size(lastFile.toPath()));
- System.out.println("this file: " + file + " +" + Files.size(file.toPath()) + " greater than "
- + Files.size(lastFile.toPath()));
- }
- // remember it for next file
- lastFile = file;
+ if (lastFile != null)
+ {
+ waitForLastWrite(file,25);
+
+ if (Files.size(file.toPath()) > Files
+ .size(lastFile.toPath()))
+ Assert.assertTrue(Files.size(file.toPath()) > Files
+ .size(lastFile.toPath()));
+ }
+ // remember it for next file
+ lastFile = file;
}
} catch (Exception x)
{
}
} catch (Exception x)
{
@@
-210,7
+214,22
@@
public class CommandsTest
}
}
}
}
+ private static long waitForLastWrite(File file, int i) throws IOException
+ {
+ long lastSize,stableSize =Files.size(file.toPath());
+ // wait around until we are sure the file has been completely written.
+ do {
+ lastSize = stableSize;
+ try {
+ Thread.sleep(i);
+ } catch (Exception x) {}
+ stableSize=Files.size(file.toPath());
+ } while (stableSize!=lastSize);
+ return stableSize;
+ }
+
@Test(groups = "Functional", dataProvider = "argfileOutputFiles", singleThreaded = true)
@Test(groups = "Functional", dataProvider = "argfileOutputFiles", singleThreaded = true)
+
public void argFilesGlobAndSubstitutionsTest(String cmdLine,
String[] filenames) throws IOException
{
public void argFilesGlobAndSubstitutionsTest(String cmdLine,
String[] filenames) throws IOException
{