diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-26 22:34:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 22:34:47 +0200 |
| commit | 8e633a944aa64f8507afc85e0b548cc0b1ed997a (patch) | |
| tree | 687e982f5c4b2d5301f5112aecc4eb23227a47e3 /smoketest/bin | |
| parent | 67ba5d6e37abe4d8cfd73ba91de15d3236a5c7f9 (diff) | |
| parent | 33d4f8adb85fbf5e3b279ef59f1d2f113639e62f (diff) | |
| download | vyos-1x-8e633a944aa64f8507afc85e0b548cc0b1ed997a.tar.gz vyos-1x-8e633a944aa64f8507afc85e0b548cc0b1ed997a.zip | |
Merge pull request #3727 from c-po/T6510-smoketesting
T6510: smoketest: generell improvement task for the smoketesting platform
Diffstat (limited to 'smoketest/bin')
| -rwxr-xr-x | smoketest/bin/vyos-configtest | 9 | ||||
| -rwxr-xr-x | smoketest/bin/vyos-configtest-pki | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/smoketest/bin/vyos-configtest b/smoketest/bin/vyos-configtest index c1b602737..fbf4055ad 100755 --- a/smoketest/bin/vyos-configtest +++ b/smoketest/bin/vyos-configtest @@ -55,7 +55,7 @@ def make_test_function(filename, test_path=None): if test_path: config_commands = self.session.show(['configuration', 'commands']) - + with open(test_path, 'r') as f: for line in f.readlines(): if not line or line.startswith("#"): @@ -83,9 +83,10 @@ if __name__ == '__main__': test_path = os.path.join(config_test_dir, config) if not os.path.exists(test_path): - test_path = None - else: - log.info(f'Loaded migration result test for config "{config}"') + log.error(f'Missing migration result test for config "{config}"') + sys.exit(1) + + log.info(f'Loaded migration result test for config "{config}"') test_func = make_test_function(config, test_path) diff --git a/smoketest/bin/vyos-configtest-pki b/smoketest/bin/vyos-configtest-pki index e753193e9..0f9ecdd41 100755 --- a/smoketest/bin/vyos-configtest-pki +++ b/smoketest/bin/vyos-configtest-pki @@ -25,9 +25,9 @@ from vyos.pki import encode_dh_parameters from vyos.pki import encode_private_key from vyos.utils.file import write_file -subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'vyos'} -ca_subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'vyos CA'} -subca_subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'vyos SubCA'} +subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'VyOS'} +ca_subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'VyOS CA'} +subca_subject = {'country': 'DE', 'state': 'BY', 'locality': 'Cloud', 'organization': 'VyOS', 'common_name': 'VyOS SubCA'} ca_cert = '/config/auth/ovpn_test_ca.pem' ca_key = '/config/auth/ovpn_test_ca.key' |