Commit Graph
2311 Commits
Author SHA1 Message Date
Jesse Glick 86ed77711b Correcting 9595175f10 (JUnit 4 merge fixup for #1472). 2015-01-06 07:03:08 -05:00
Oliver Gondža 9595175f10 Use JUnit4 in merged patch too 2015-01-06 12:28:01 +01:00
Oliver Gondža 5bfaca449c Merge pull request #1472 from jbaranov/JENKINS-25514
[JENKINS-25514] Fixed lock case in FutureImpl
2015-01-06 11:52:32 +01:00
Jesse Glick 4470b9ea04 JUnit 4. 2015-01-05 18:01:32 -05:00
Jesse Glick 449fd234a6 Indentation fix. 2015-01-05 15:52:23 -05:00
Jesse Glick 778e9e194e JUnit 4. 2015-01-05 15:45:16 -05:00
Kohsuke Kawaguchi 239caf89ec the trunk is toward 1.598-SNAPSHOT 2015-01-04 17:45:38 -08:00
Jesse Glick 7d248e3572 Merge pull request #1507 from darxriggs/no-more-GroovyHudsonTestCase
not using the deprecated GroovyHudsonTestCase anymore
2015-01-02 12:36:15 -05:00
René Scheibe 8aebada975 not using the deprecated GroovyHudsonTestCase anymore
* just the two updated classes were affected
2015-01-02 01:52:41 +01:00
René Scheibe 73efe6825a convert tests from JUnit3 to JUnit4
* life goes on :-)
* touching all tests that directly inherit from junit.framework.TestCase
2014-12-27 22:41:09 +01:00
René Scheibe d2f49da5b6 cleanup - make pom.xml files more consistent 2014-12-25 18:20:07 +01:00
Kohsuke Kawaguchi 296849edf9 Merge pull request 1379 2014-12-22 14:33:48 -08:00
Kohsuke Kawaguchi 44d5c2853c the trunk is toward 1.597-SNAPSHOT 2014-12-21 21:29:45 -08:00
Jesse Glick b415b467fb Replacing Util.createTempDir with the standard TemporaryFolder rule in some tests. 2014-12-17 15:04:45 -05:00
Jesse Glick 65ae5c281c Merge branch 'master' into build-number-is-id-JENKINS-24380 2014-12-15 13:44:01 -05:00
Kohsuke Kawaguchi 84585f0c3c the trunk is toward 1.596-SNAPSHOT 2014-12-15 07:13:08 -08:00
Jesse Glick 7c988de3cd Merge branch 'master' into build-number-is-id-JENKINS-24380 2014-12-12 13:27:31 -05:00
Jesse Glick 81701326a0 Merge branch 'unique-Permission' (#1444). 2014-12-10 09:27:54 -05:00
Jesse Glick ce94579c50 [FIXED JENKINS-25788] RunMap.remove was always returning false, even when the Run was in fact removed. 2014-12-09 15:24:06 -05:00
Jesse Glick 96ecabedb0 JUnit 4. 2014-12-09 15:12:19 -05:00
Jesse Glick 30f00b111a For RunMapTest to be Groovy was pointless and aggravating. 2014-12-09 15:07:15 -05:00
Eugene Baranov 3edae667b3 [JENKINS-25514] Fixed lock case in FutureImpl
when some other process is waiting for build in queue.
2014-12-09 21:51:39 +02:00
Jesse Glick cce358bf39 Merge branch 'master' of git://github.com/jenkinsci/jenkins
Conflicts:
	changelog.html
2014-12-09 14:22:05 -05:00
Kohsuke Kawaguchi 37986c0331 the trunk is toward 1.595-SNAPSHOT 2014-12-07 22:04:03 -08:00
Dominique 60c2071a30 [JENKINS-23966] Master labels disappear when system configuration is updated 2014-12-04 20:26:49 -05:00
Kohsuke Kawaguchi 0f0132481d the trunk is toward 1.594-SNAPSHOT 2014-11-30 17:21:27 -08:00
Kohsuke Kawaguchi 35c0c7000a the trunk is toward 1.593-SNAPSHOT 2014-11-25 19:50:29 -08:00
Jesse Glick 1568166e76 Merge pull request #1464 from KostyaSha/fix_warexploder
Explode WAR fails when ./target does not yet exist (e.g., run from IDEA)
2014-11-17 10:42:07 -05:00
Kohsuke Kawaguchi 7f990004ec the trunk is toward 1.592-SNAPSHOT 2014-11-16 19:34:12 -08:00
Kanstantsin Shautsou 9aaeb0a3f2 Explode WAR fails when ./target does not yet exist (e.g., run from IDEA).
Create parent directory before trying to lock dir using files.

java.lang.Exception: Failed to initialize exploded war
at org.jvnet.hudson.test.WarExploder.getExplodedDir(WarExploder.java:49)
at org.jvnet.hudson.test.JenkinsRule.createWebServer(JenkinsRule.java:582)
at org.jvnet.hudson.test.JenkinsRule.newHudson(JenkinsRule.java:538)
at org.jvnet.hudson.test.JenkinsRule.before(JenkinsRule.java:332)
at org.jvnet.hudson.test.JenkinsRule$2.evaluate(JenkinsRule.java:482)
at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:48)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.junit.runner.JUnitCore.run(JUnitCore.java:160)
at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:74)
at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:211)
at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:67)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
Caused by: java.io.FileNotFoundException: /Users/integer/Documents/idea/jenkins-ws-git-plugin/./target/jenkins-for-test.exploding (No such file or directory)
at java.io.FileOutputStream.open(Native Method)
at java.io.FileOutputStream.(FileOutputStream.java:212)
at java.io.FileOutputStream.(FileOutputStream.java:104)
at org.jvnet.hudson.test.WarExploder.explode(WarExploder.java:99)
at org.jvnet.hudson.test.WarExploder.(WarExploder.java:58)
... 24 more
2014-11-16 02:55:42 +03:00
Jesse Glick bc430e7ec7 Merge branch 'master' into unique-Permission 2014-11-10 15:36:47 -05:00
Kohsuke Kawaguchi 9edf0e3f79 the trunk is toward 1.591-SNAPSHOT 2014-11-10 06:12:33 -08:00
Kohsuke Kawaguchi ada8432fc5 [JENKINS-25144] Merge pull request #1427 2014-11-07 09:43:25 -08:00
Christof Schoell 0176b6d902 [JENKINS-25144]
return authentication object instead of null if authentication is not
required - otherwise valid login fails with basic authentication
2014-11-07 09:40:26 -08:00
Jesse Glick ee13a9a930 junit 1.2-beta-4 2014-11-04 15:01:03 -05:00
Kohsuke Kawaguchi b93a79ceeb the trunk is toward 1.590-SNAPSHOT 2014-11-02 20:56:21 -08:00
Kohsuke Kawaguchi 388148e257 the trunk is toward 1.589-SNAPSHOT 2014-10-29 20:47:31 -07:00
Kohsuke Kawaguchi bf736a7407 [maven-release-plugin] prepare for next development iteration 2014-10-29 18:10:06 -07:00
Kohsuke Kawaguchi b3660bf84e [maven-release-plugin] prepare release jenkins-1.587 2014-10-29 18:10:06 -07:00
Jesse Glick 8878c7fa5b Prevent duplicate Permission or PermissionGroup objects from being created. 2014-10-28 16:18:20 -04:00
Jesse Glick d0cdcb5798 JUnit 4. 2014-10-28 15:42:17 -04:00
Jesse Glick 8c10c75d85 Merge branch 'security-rc' into SECURITY-144-rc 2014-10-28 11:20:25 -04:00
Kohsuke Kawaguchi 6ee4d4a927 the trunk is toward 1.588-SNAPSHOT 2014-10-26 21:31:09 -07:00
Jesse Glick f0658e233d Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
2014-10-26 13:55:39 -07:00
Jesse Glick 12f5dec0ed junit 1.2-beta-3 2014-10-25 15:39:08 -07:00
Jesse Glick 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04:00
Kohsuke Kawaguchi 0fa32eac4e the trunk is toward 1.587-SNAPSHOT 2014-10-19 21:51:18 -07:00
Kohsuke Kawaguchi b4c2a1392b Now that the default is off, test has to activate this explicitly 2014-10-18 22:42:08 -07:00
Kohsuke Kawaguchi b4ffb2d01b More follow-up renames 2014-10-18 19:47:19 -07:00
Jesse Glick 32376946b8 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
2014-10-16 13:18:39 -04:00