merge from master at 18.3-9-g2e62cb8a

3 files changed, 3 insertions, 88 deletions

diff --git a/tests/cloud_tests/testcases/modules/salt_minion.py b/tests/cloud_tests/testcases/modules/salt_minion.py
deleted file mode 100644
index fc9688ed..00000000
--- a/tests/cloud_tests/testcases/modules/salt_minion.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""cloud-init Integration Test Verify Script."""
-from tests.cloud_tests.testcases import base
-
-
-class Test(base.CloudTestCase):
-    """Test salt minion module."""
-
-    def test_minon_master(self):
-        """Test master value in config."""
-        out = self.get_data_file('minion')
-        self.assertIn('master: salt.mydomain.com', out)
-
-    def test_minion_pem(self):
-        """Test private key."""
-        out = self.get_data_file('minion.pem')
-        self.assertIn('------BEGIN PRIVATE KEY------', out)
-        self.assertIn('<key data>', out)
-        self.assertIn('------END PRIVATE KEY-------', out)
-
-    def test_minion_pub(self):
-        """Test public key."""
-        out = self.get_data_file('minion.pub')
-        self.assertIn('------BEGIN PUBLIC KEY-------', out)
-        self.assertIn('<key data>', out)
-        self.assertIn('------END PUBLIC KEY-------', out)
-
-    def test_grains(self):
-        """Test master value in config."""
-        out = self.get_data_file('grains')
-        self.assertIn('role: web', out)
-
-    def test_minion_installed(self):
-        """Test if the salt-minion package is installed"""
-        self.assertPackageInstalled('salt-minion')
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/salt_minion.yaml b/tests/cloud_tests/testcases/modules/salt_minion.yaml
deleted file mode 100644
index 9227147c..00000000
--- a/tests/cloud_tests/testcases/modules/salt_minion.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Create config for a salt minion
-#
-# 2016-11-17: Currently takes >60 seconds results in test failure
-#
-enabled: True
-cloud_config: |
-  #cloud-config
-  salt_minion:
-      conf:
-          master: salt.mydomain.com
-      public_key: |
-          ------BEGIN PUBLIC KEY-------
-          <key data>
-          ------END PUBLIC KEY-------
-      private_key: |
-          ------BEGIN PRIVATE KEY------
-          <key data>
-          ------END PRIVATE KEY-------
-      grains:
-          role: web
-collect_scripts:
-  minion: |
-    #!/bin/bash
-    cat /etc/salt/minion
-  minion_id: |
-    #!/bin/bash
-    cat /etc/salt/minion_id
-  minion.pem: |
-    #!/bin/bash
-    PRIV_KEYFILE=/etc/salt/pki/minion/minion.pem
-    if [ ! -f $PRIV_KEYFILE ]; then
-        # Bionic and later automatically moves /etc/salt/pki/minion/*
-        PRIV_KEYFILE=/var/lib/salt/pki/minion/minion.pem
-    fi
-    cat $PRIV_KEYFILE
-  minion.pub: |
-    #!/bin/bash
-    PUB_KEYFILE=/etc/salt/pki/minion/minion.pub
-    if [ ! -f $PUB_KEYFILE ]; then
-        # Bionic and later automatically moves /etc/salt/pki/minion/*
-        PUB_KEYFILE=/var/lib/salt/pki/minion/minion.pub
-    fi
-    cat $PUB_KEYFILE
-  grains: |
-    #!/bin/bash
-    cat /etc/salt/grains
-
-# vi: ts=4 expandtab
diff --git a/tests/unittests/test_datasource/test_azure_helper.py b/tests/unittests/test_datasource/test_azure_helper.py
index af9d3e1a..26b2b93d 100644
--- a/tests/unittests/test_datasource/test_azure_helper.py
+++ b/tests/unittests/test_datasource/test_azure_helper.py
@@ -85,7 +85,9 @@ class TestFindEndpoint(CiTestCase):
         self.dhcp_options.return_value = {"eth0": {"unknown_245": "5:4:3:2"}}
         self.assertEqual('5.4.3.2', wa_shim.find_endpoint(None))
 
-    def test_latest_lease_used(self):
+    @mock.patch('cloudinit.sources.helpers.azure.util.is_FreeBSD')
+    def test_latest_lease_used(self, m_is_freebsd):
+        m_is_freebsd.return_value = False  # To avoid hitting load_file
         encoded_addresses = ['5:4:3:2', '4:3:2:1']
         file_content = '\n'.join([self._build_lease_content(encoded_address)
                                   for encoded_address in encoded_addresses])