Merge branch 'master' into pr/cleanWorktreeCheck

This commit is contained in:
Christopher Fenner
2018-09-10 13:28:57 +02:00
committed by GitHub
-11
View File
@@ -1,12 +1,9 @@
import org.junit.Before
import org.junit.BeforeClass
import org.junit.ClassRule
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.rules.ExpectedException
import org.junit.rules.RuleChain
import org.junit.rules.TemporaryFolder
import org.yaml.snakeyaml.parser.ParserException
import hudson.AbortException
@@ -23,9 +20,6 @@ public class MtaBuildTest extends BasePiperTest {
def toolMtaValidateCalled = false
def toolJavaValidateCalled = false
@ClassRule
public static TemporaryFolder tmp = new TemporaryFolder()
private ExpectedException thrown = new ExpectedException()
private JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
private JenkinsShellCallRule jscr = new JenkinsShellCallRule(this)
@@ -43,11 +37,6 @@ public class MtaBuildTest extends BasePiperTest {
.around(jder)
.around(jsr)
@BeforeClass
static void createTestFiles() {
}
@Before
void init() {