Commit Graph
1702 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
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
Jesse Glick b415b467fb Replacing Util.createTempDir with the standard TemporaryFolder rule in some tests. 2014-12-17 15:04:45 -05: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
Dominique 60c2071a30 [JENKINS-23966] Master labels disappear when system configuration is updated 2014-12-04 20:26:49 -05: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 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 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 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 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04: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
Jesse Glick ccbe96227f Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
	pom.xml
2014-10-16 13:18:08 -04:00
Jesse Glick b3bb0b8ae4 FilePath.untar, as called by jenkins-clone-workspace-scm-plugin, was also broken.
.tar and .zip seem OK.
2014-10-15 18:24:30 -04:00
Jesse Glick f39c2f1ba2 Renamed to more appropriate package. 2014-10-15 18:05:16 -04:00
Jesse Glick d7abde81d3 Reproduced FilePath.unzip problem from chromedriver-plugin in test. 2014-10-15 16:36:41 -04:00
Kenneth Garland e168f4d4c9 Changed wording for command line message. 2014-10-15 14:26:05 -04:00
Daniel Beck d5d47edae4 Merge branch 'master' of https://github.com/jenkinsci/jenkins into JENKINS-3539
Conflicts:
	test/src/test/java/hudson/model/ParametersTest.java
2014-10-15 01:13:45 +02:00
Daniel Beck 190f0b6faf [FIXED JENKINS-3539] Prevent empty file creation if left empty 2014-10-15 00:33:49 +02:00
Oliver Gondža 75f5d2180f [JENKINS-11543] Unit test 2014-10-13 22:03:13 +02:00
Harald Albers aeec1394f1 Merge pull request #1417 from bkmeneguello/portuguese-translation
Lots of translations and some typo fixes
2014-10-10 22:13:23 +02:00
Jesse Glick ef6c042447 Merge branch 'JENKINS-24763' of github.com:recampbell/jenkins 2014-10-10 15:28:58 -04:00
Jesse Glick c8b6f12784 Merge pull request #1414 from mattmoor/master
Convert AbstractProject to better utilize structure form submission.
2014-10-08 00:32:57 -04:00
Jesse Glick 0adf979c4a [FIXED JENKINS-10450] Use 404 status code for noWorkspace.jelly. 2014-10-07 23:33:30 -04:00
Bruno Kühnen Meneguello d6b4a69b81 Lots of translations and some typo fixes 2014-10-07 09:51:19 -03:00
Jesse Glick 383b90eaf5 waitUntilNoActivityUpTo should list OneOffExecutable.executor if that is the problem. 2014-10-03 16:31:03 -04:00
Jesse Glick c4c55d1c03 waitUntilNoActivityUpTo should also produce a thread dump (despite 80da8f2). 2014-10-03 16:00:56 -04:00
Kohsuke Kawaguchi 926e5f10bc merged back the RC branch 2014-10-01 12:54:13 -07:00
Matt Moore eec43983a3 This change converts several optionalBlock's wrapping a single field to inline="true".
By converting several optionalBlock entries to use inline="true", we convert the submitted JSON from:
   "hasPropertyFoo": {
     "propertyFoo": "value"
   },

which is a somewhat unnatural naming scheme, to:
   "hasPropertyFoo": true,
   "propertyFoo": "value",

This enables us to use the pattern:
   if(json.optBoolean("hasPropertyFoo", json.has("propertyFoo"))) {
     ...
   }

To permit either of the following as JSON blobs, for specifying a value for "propertyFoo":
1) "hasPropertyFoo": true,            # What comes through from jelly
   "propertyFoo": "value",

2) "propertyFoo": "value",

It also allows any of the following as JSON blobs, for NOT specifying a value for "propertyFoo":
3) "hasPropertyFoo": false,           # What comes through from jelly
   "propertyFoo": "value",

4) "hasPropertyFoo": false,

5) (nothing specified)

NOTE: The main interest in flexibility in what JSON comes through is in support of: https://wiki.jenkins-ci.org/display/JENKINS/YAML+Project+Plugin, this is also the purpose of the couple renames that are mixed in with this.
2014-09-29 09:36:19 -07:00
Jesse Glick 85f356bc5f Forgotten compilability fix.
(cherry picked from commit 20e5d06280fcce471abfdcc1921bd607c6a1f4df)
2014-09-26 17:33:36 -04:00
Jesse Glick 89cbfc4639 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/EnvVars.java
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/cli/ClientAuthenticationCache.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/model/Computer.java
	core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
	core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
	core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
	core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
	core/src/main/java/hudson/slaves/Channels.java
	core/src/main/java/hudson/slaves/SlaveComputer.java
	core/src/main/java/hudson/tasks/Fingerprinter.java
	core/src/main/java/hudson/tasks/Shell.java
	core/src/main/java/hudson/tasks/junit/JUnitParser.java
	core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
	core/src/main/java/hudson/util/ProcessTree.java
	core/src/main/java/hudson/util/RemotingDiagnostics.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/test/java/hudson/LauncherTest.java
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
2014-09-26 15:56:48 -04:00
Jesse Glick 4f736a9334 Merge branch 'security' into SECURITY-144 2014-09-25 13:30:42 -04:00