summaryrefslogtreecommitdiff
path: root/tests/integration_tests/util.py
diff options
context:
space:
mode:
authorJames Falcon <james.falcon@canonical.com>2021-11-15 16:20:10 -0600
committerGitHub <noreply@github.com>2021-11-15 15:20:10 -0700
commitf0af9f78796ad73bfc2f8016b9bf744da2f12761 (patch)
tree4ee68c04654e33d908278622cf2cc65928bde4c8 /tests/integration_tests/util.py
parent918d69a02ec9cb891a5bc987bdce783802b1a743 (diff)
downloadvyos-cloud-init-f0af9f78796ad73bfc2f8016b9bf744da2f12761.tar.gz
vyos-cloud-init-f0af9f78796ad73bfc2f8016b9bf744da2f12761.zip
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
Diffstat (limited to 'tests/integration_tests/util.py')
-rw-r--r--tests/integration_tests/util.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/integration_tests/util.py b/tests/integration_tests/util.py
index 407096cd..e40d80fe 100644
--- a/tests/integration_tests/util.py
+++ b/tests/integration_tests/util.py
@@ -52,6 +52,15 @@ def verify_clean_log(log):
'http://169.254.169.254/latest/meta-data/')
warning_texts.append(fetch_error_text)
traceback_texts.append(fetch_error_text)
+ # Oracle has a file in /etc/cloud/cloud.cfg.d that contains
+ # users:
+ # - default
+ # - name: opc
+ # ssh_redirect_user: true
+ # This can trigger a warning about opc having no public key
+ warning_texts.append(
+ 'Unable to disable SSH logins for opc given ssh_redirect_user'
+ )
for warning_text in warning_texts:
expected_warnings += log.count(warning_text)