Merge pull request #596 from res0nance/fix-tests

Fix failing tests
jenkinsci · Apr 13, 2021 · 53a5cb1 · 53a5cb1
2 parents a674aee + 3ce5b24
commit 53a5cb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/test/java/hudson/plugins/ec2/ConfigurationAsCodeTest.java b/src/test/java/hudson/plugins/ec2/ConfigurationAsCodeTest.java
@@ -63,7 +63,7 @@ public void testUnixData() throws Exception {
 
         final SpotConfiguration spotConfig = slaveTemplate.spotConfig;
         assertNotEquals(null, spotConfig);
-        assertEquals(true, spotConfig.getFallbackToOndemand());
+        assertTrue(spotConfig.getFallbackToOndemand());
         assertEquals(3, spotConfig.getSpotBlockReservationDuration());
         assertEquals("0.15", spotConfig.getSpotMaxBidPrice());
         assertTrue(spotConfig.useBidPrice);
@@ -98,7 +98,7 @@ public void testUnix() throws Exception {
         assertTrue(ec2Cloud.canProvision(new LabelAtom("clear")));
         assertTrue(ec2Cloud.canProvision(new LabelAtom("linux")));
 
-        assertEquals(null, slaveTemplate.spotConfig);
+        assertNull(slaveTemplate.spotConfig);
     }
 
     @Test
@@ -121,7 +121,7 @@ public void testWindowsData() throws Exception {
         assertTrue(ec2Cloud.canProvision(new LabelAtom("vs2019")));
 
         final AMITypeData amiType = slaveTemplate.getAmiType();
-        assertTrue(!amiType.isUnix());
+        assertFalse(amiType.isUnix());
         assertTrue(amiType.isWindows());
         assertTrue(amiType instanceof WindowsData);
         final WindowsData windowsData = (WindowsData) amiType;
@@ -275,7 +275,7 @@ public void testMac() throws Exception {
         assertTrue(ec2Cloud.canProvision(new LabelAtom("clear")));
         assertTrue(ec2Cloud.canProvision(new LabelAtom("mac")));
 
-        assertEquals(null, slaveTemplate.spotConfig);
+        assertNull(slaveTemplate.spotConfig);
     }
 
     @Test

diff --git a/src/test/resources/hudson/plugins/ec2/MacDataExport.yml b/src/test/resources/hudson/plugins/ec2/MacDataExport.yml
@@ -14,6 +14,7 @@
       connectBySSHProcess: false
       connectionStrategy: PRIVATE_IP
       deleteRootOnTermination: false
+      ebsEncryptRootVolume: DEFAULT
       ebsOptimized: false
       hostKeyVerificationStrategy: CHECK_NEW_SOFT
       labelString: "mac metal"