summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-06-28 17:22:33 -0400
committerScott Moser <smoser@brickies.net>2018-06-28 17:22:33 -0400
commit5858136215753cffc2080c85429a3c7a3754741c (patch)
treee088ae2d06ea455fe7489a8f45e299870336c07b
parentbb2cc5dde5f2c70c3a6b6c1c1834fa8780677038 (diff)
downloadvyos-cloud-init-5858136215753cffc2080c85429a3c7a3754741c.tar.gz
vyos-cloud-init-5858136215753cffc2080c85429a3c7a3754741c.zip
tests: drop salt-minion integration test
The salt minion integration test as we had it did not do a whole lot more than the unit tests on that module did. Additionally, it caused some transient failures at least in Ubuntu 18.04. At a future date we may choose to add an integration test that installs salt-minion and salt server and configures it to be a better test. LP: #1778737
-rw-r--r--tests/cloud_tests/testcases/modules/salt_minion.py38
-rw-r--r--tests/cloud_tests/testcases/modules/salt_minion.yaml49
2 files changed, 0 insertions, 87 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