Thanks, Ben, that looks good. On 27-01-16 04:01, Ben Caradoc-Davies wrote: > On 27/01/16 13:51, [email protected] wrote: >> See<http://winbuild.geo-solutions.it/jenkins/job/GeoServer-Master/2551/> > [...] >> [INFO] Demoes Module ..................................... FAILURE >> [33.072s] > > Niels, I have pushed a fix to master for this Windows build failure. > It changes a fix you made for the Wicket code sprint; please let me > know if this change is different to your intent. > https://github.com/geoserver/geoserver/commit/e7db0b0b13df5fd81d0bd8232fc6149765a8f3cf > > > > The problem is that File.getPath() contains backslashes on Windows > while Resource.path() has forward slashes. My fix replaces > demoDir.getPath() (i.e. File.getPath()) with > Files.asResource(demoDir).path() in the unit test assertEquals. This > makes the test more portable by deriving both expected and actual > strings with Resource.path(). > > These were the affected failures on Windows: > > Failed tests: > testProxyBaseUrl(org.geoserver.web.demo.DemoRequestsPageTest): > expected:<C:[\.jenkins\jobs\GeoServer-Master\workspace\src\web\demo\target\test-classes\org\geoserver\web\demo\test-data\]demo-requests> > > but > was:<C:[/.jenkins/jobs/GeoServer-Master/workspace/src/web/demo/target/test-classes/org/geoserver/web/demo/test-data/]demo-requests> > testUrlLinkUnmodified(org.geoserver.web.demo.DemoRequestsPageTest): > expected:<C:[\.jenkins\jobs\GeoServer-Master\workspace\src\web\demo\target\test-classes\org\geoserver\web\demo\test-data\]demo-requests> > > but > was:<C:[/.jenkins/jobs/GeoServer-Master/workspace/src/web/demo/target/test-classes/org/geoserver/web/demo/test-data/]demo-requests> > testUrlLinkSelected(org.geoserver.web.demo.DemoRequestsPageTest): > expected:<C:[\.jenkins\jobs\GeoServer-Master\workspace\src\web\demo\target\test-classes\org\geoserver\web\demo\test-data\]demo-requests> > > but > was:<C:[/.jenkins/jobs/GeoServer-Master/workspace/src/web/demo/target/test-classes/org/geoserver/web/demo/test-data/]demo-requests> > > Here is one sample stack trace: > > Tests run: 6, Failures: 3, Errors: 0, Skipped: 0, Time elapsed: 11.42 > sec <<< FAILURE! > testProxyBaseUrl(org.geoserver.web.demo.DemoRequestsPageTest) Time > elapsed: 9829 sec <<< FAILURE! > org.junit.ComparisonFailure: > expected:<C:[\.jenkins\jobs\GeoServer-Master\workspace\src\web\demo\target\test-classes\org\geoserver\web\demo\test-data\]demo-requests> > > but > was:<C:[/.jenkins/jobs/GeoServer-Master/workspace/src/web/demo/target/test-classes/org/geoserver/web/demo/test-data/]demo-requests> > at org.junit.Assert.assertEquals(Assert.java:115) > at org.junit.Assert.assertEquals(Assert.java:144) > at > org.geoserver.web.demo.DemoRequestsPageTest.testProxyBaseUrl(DemoRequestsPageTest.java:224) > > Kind regards, >
------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ Geoserver-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geoserver-devel
