Uh oh!
There was an error while loading. Please reload this page.
Fixing Java unit tests in storm-core to run under Windows (1.x branch) - #2414
Closed
lawrencecraft wants to merge 1 commit into
Closed
Fixing Java unit tests in storm-core to run under Windows (1.x branch)#2414lawrencecraft wants to merge 1 commit into
lawrencecraft wants to merge 1 commit into
Conversation
lawrencecraftforce-pushed
the
WindowsTestFix-1.x
branch
from
November 12, 2017 02:08
c32af1f to
6e6e099Comparesrdo
requested changes
Nov 12, 2017
srdo
left a comment
Contributor
There was a problem hiding this comment.
@lawrencecraft Thanks for the contribution. I agree that we should change the tests to be Windows compatible, left some suggestions.
Please open a new issue on jira to track this, and open a PR against master as well. We need all fixes to go into master first. This is so we can be sure not to "lose" fixes in later releases.
| final String confKey = topoId + "-stormconf.ser"; | ||
| final String stormLocal = "/tmp/storm-local/"; | ||
| final String stormRoot = stormLocal+topoId+"/"; | ||
| final String stormLocalAbsolutePath = new File("/tmp/storm-local/").getAbsolutePath(); |
Contributor
There was a problem hiding this comment.
Use Files.createTempFile instead of /tmp.
| private static final String DOUBLE_SEP = File.separator + File.separator; | ||
| static String asAbsPath(String ... parts) { | ||
| return (File.separator + PATH_JOIN.join(parts)).replace(DOUBLE_SEP, File.separator); | ||
| String path = (File.separator + PATH_JOIN.join(parts)).replace(DOUBLE_SEP, File.separator); |
Contributor
There was a problem hiding this comment.
I think starting a path with / or \ is inherently going to be fragile on Windows. It might be better to remove the initial file separator from here, and throw an exception if the first path part is File.separator . Then you can probably also get rid of the DOUBLE_SEP replacement. Same check should be in asPath. In order to work on Windows, paths should start from e.g. java.io.tmpdir or the current working directory instead of the filesystem root I think.
| @@ -370,7 +370,7 @@ public void testLaunch() throws Exception { | |||
| final String workerConf = ContainerTest.asAbsPath(log4jdir, "worker.xml"); | |||
Contributor
There was a problem hiding this comment.
If you start the paths from Files.createTempFile instead of tmp for stormHome and stormLocal, you should be able to get rid of the prependFilePrefixIfOnWindows method.
lawrencecraft
commented
Nov 12, 2017
ContributorAuthor
Thanks Stig, will do. I might submit a fix for STORM-2797 (the LogViewer issue) first, if that's alright, as I've got that almost ready to go. I can track the fixing of the unit tests separately. |
srdo
commented
Nov 13, 2017
Contributor
Sounds good. |
d2r pushed a commit
to d2r/storm
that referenced
this pull request
Oct 16, 2018
We are closing stale Pull Requests to make the list more manageable. Please re-open any Pull Request that has been closed in error. Closesapache#608Closesapache#639Closesapache#640Closesapache#648Closesapache#662Closesapache#668Closesapache#692Closesapache#705Closesapache#724Closesapache#728Closesapache#730Closesapache#753Closesapache#803Closesapache#854Closesapache#922Closesapache#986Closesapache#992Closesapache#1019Closesapache#1040Closesapache#1041Closesapache#1043Closesapache#1046Closesapache#1051Closesapache#1078Closesapache#1146Closesapache#1164Closesapache#1165Closesapache#1178Closesapache#1213Closesapache#1225Closesapache#1258Closesapache#1259Closesapache#1268Closesapache#1272Closesapache#1277Closesapache#1278Closesapache#1288Closesapache#1296Closesapache#1328Closesapache#1342Closesapache#1353Closesapache#1370Closesapache#1376Closesapache#1391Closesapache#1395Closesapache#1399Closesapache#1406Closesapache#1410Closesapache#1422Closesapache#1427Closesapache#1443Closesapache#1462Closesapache#1468Closesapache#1483Closesapache#1506Closesapache#1509Closesapache#1515Closesapache#1520Closesapache#1521Closesapache#1525Closesapache#1527Closesapache#1544Closesapache#1550Closesapache#1566Closesapache#1569Closesapache#1570Closesapache#1575Closesapache#1580Closesapache#1584Closesapache#1591Closesapache#1600Closesapache#1611Closesapache#1613Closesapache#1639Closesapache#1703Closesapache#1711Closesapache#1719Closesapache#1737Closesapache#1760Closesapache#1767Closesapache#1768Closesapache#1785Closesapache#1799Closesapache#1822Closesapache#1824Closesapache#1844Closesapache#1874Closesapache#1918Closesapache#1928Closesapache#1937Closesapache#1942Closesapache#1951Closesapache#1957Closesapache#1963Closesapache#1964Closesapache#1965Closesapache#1967Closesapache#1968Closesapache#1971Closesapache#1985Closesapache#1986Closesapache#1998Closesapache#2031Closesapache#2032Closesapache#2071Closesapache#2076Closesapache#2108Closesapache#2119Closesapache#2128Closesapache#2142Closesapache#2174Closesapache#2206Closesapache#2297Closesapache#2322Closesapache#2332Closesapache#2341Closesapache#2377Closesapache#2414Closesapache#2469
d2r pushed a commit
to d2r/storm
that referenced
this pull request
Oct 16, 2018
We are closing stale Pull Requests to make the list more manageable. Please re-open any Pull Request that has been closed in error. Closesapache#608Closesapache#639Closesapache#640Closesapache#648Closesapache#662Closesapache#668Closesapache#692Closesapache#705Closesapache#724Closesapache#728Closesapache#730Closesapache#753Closesapache#803Closesapache#854Closesapache#922Closesapache#986Closesapache#992Closesapache#1019Closesapache#1040Closesapache#1041Closesapache#1043Closesapache#1046Closesapache#1051Closesapache#1078Closesapache#1146Closesapache#1164Closesapache#1165Closesapache#1178Closesapache#1213Closesapache#1225Closesapache#1258Closesapache#1259Closesapache#1268Closesapache#1272Closesapache#1277Closesapache#1278Closesapache#1288Closesapache#1296Closesapache#1328Closesapache#1342Closesapache#1353Closesapache#1370Closesapache#1376Closesapache#1391Closesapache#1395Closesapache#1399Closesapache#1406Closesapache#1410Closesapache#1422Closesapache#1427Closesapache#1443Closesapache#1462Closesapache#1468Closesapache#1483Closesapache#1506Closesapache#1509Closesapache#1515Closesapache#1520Closesapache#1521Closesapache#1525Closesapache#1527Closesapache#1544Closesapache#1550Closesapache#1566Closesapache#1569Closesapache#1570Closesapache#1575Closesapache#1580Closesapache#1584Closesapache#1591Closesapache#1600Closesapache#1611Closesapache#1613Closesapache#1639Closesapache#1703Closesapache#1711Closesapache#1719Closesapache#1737Closesapache#1760Closesapache#1767Closesapache#1768Closesapache#1785Closesapache#1799Closesapache#1822Closesapache#1824Closesapache#1844Closesapache#1874Closesapache#1918Closesapache#1928Closesapache#1937Closesapache#1942Closesapache#1951Closesapache#1957Closesapache#1963Closesapache#1964Closesapache#1965Closesapache#1967Closesapache#1968Closesapache#1971Closesapache#1985Closesapache#1986Closesapache#1998Closesapache#2031Closesapache#2032Closesapache#2071Closesapache#2076Closesapache#2108Closesapache#2119Closesapache#2128Closesapache#2142Closesapache#2174Closesapache#2206Closesapache#2297Closesapache#2322Closesapache#2332Closesapache#2341Closesapache#2377Closesapache#2414Closesapache#2469
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While fixing STORM-2797 I noticed a bunch of the storm-core tests didn't run under Windows.
I've fixed them up to use Windows-friendly asserts. All are done in a generic way through framework classes except one particular case where the behavior actually differs based on operating system. I only modified tests, not any actual application code. I tested this change on Windows, OS X, and Linux: all pass. On Windows, I still have to run Maven as administrator as some of the tests write to temp folders in AppData.
I'll follow up with a pull request for STORM-2797. There are still some Clojure tests failing but a lot of them are around the logviewer, which will be fixed by my next PR.