Some miscellaneous integration test fixes (SC-606) (#1103)

- Added to list of expected warnings on Oracle when opc user has
  no ssh key
- Added retries to tests that read from syslog as that can sometimes
  take time to reflect in the log
- Updated test_apt.py to remove proxy info into its own test as that
  can cause failures in updating, which will immediately traceback
  out of the module and prevent us from running further class tests
- Updated test_apt.py to use a more updated ppa in the test_keyserver
- Added basic rsyslog test to test_combined.py
- Added basic puppet test as test_puppet.py

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/integration_tests/modules/test_combined.py b/tests/integration_tests/modules/test_combined.py
index 9cd1648a..57c02f47 100644
--- a/tests/integration_tests/modules/test_combined.py
+++ b/tests/integration_tests/modules/test_combined.py
@@ -33,8 +33,21 @@ locale: en_GB.UTF-8
 locale_configfile: /etc/default/locale
 ntp:
   servers: ['ntp.ubuntu.com']
+rsyslog:
+  configs:
+    - "*.* @@127.0.0.1"
+    - filename: 0-basic-config.conf
+      content: |
+        module(load="imtcp")
+        input(type="imtcp" port="514")
+        $template RemoteLogs,"/var/tmp/rsyslog.log"
+        *.* ?RemoteLogs
+        & ~
+  remotes:
+    me: "127.0.0.1"
 runcmd:
   - echo 'hello world' > /var/tmp/runcmd_output
+  - logger "My test log"
 """
 
 
@@ -102,6 +115,11 @@ class TestCombined:
             'en_US.UTF-8'
         ], locale_gen)
 
+    def test_rsyslog(self, class_client: IntegrationInstance):
+        """Test rsyslog is configured correctly."""
+        client = class_client
+        assert 'My test log' in client.read_from_file('/var/tmp/rsyslog.log')
+
     def test_runcmd(self, class_client: IntegrationInstance):
         """Test runcmd works as expected"""
         client = class_client