summaryrefslogtreecommitdiff
path: root/smoketest/scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-11-23 13:44:30 +0100
committerGitHub <noreply@github.com>2023-11-23 13:44:30 +0100
commit11d531ece3e06dc68349d8ea1fd3bf39d5d857f3 (patch)
tree53023218fe525c617fc0a09d6cc6c5fe14e266cd /smoketest/scripts
parent319e1bf7f23c33c202271efda2187f086b79e0c0 (diff)
parent1ba7d4e3e91b7e29447aca50295efda550239652 (diff)
downloadvyos-1x-11d531ece3e06dc68349d8ea1fd3bf39d5d857f3.tar.gz
vyos-1x-11d531ece3e06dc68349d8ea1fd3bf39d5d857f3.zip
Merge pull request #2534 from c-po/backport-pr-2522
https api: T5772: check if keys are configured unless PAM auth is enabled for GraphQL (backport #2522)
Diffstat (limited to 'smoketest/scripts')
-rwxr-xr-xsmoketest/scripts/cli/test_service_https.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/smoketest/scripts/cli/test_service_https.py b/smoketest/scripts/cli/test_service_https.py
index 901a1857e..24e1f1299 100755
--- a/smoketest/scripts/cli/test_service_https.py
+++ b/smoketest/scripts/cli/test_service_https.py
@@ -25,6 +25,8 @@ from base_vyostest_shim import ignore_warning
from vyos.utils.file import read_file
from vyos.utils.process import process_named_running
+from vyos.configsession import ConfigSessionError
+
base_path = ['service', 'https']
pki_base = ['pki']
@@ -62,9 +64,6 @@ class TestHTTPSService(VyOSUnitTestSHIM.TestCase):
cls.cli_delete(cls, pki_base)
def tearDown(self):
- # Check for running process
- self.assertTrue(process_named_running(PROCESS_NAME))
-
self.cli_delete(base_path)
self.cli_delete(pki_base)
self.cli_commit()
@@ -89,6 +88,7 @@ class TestHTTPSService(VyOSUnitTestSHIM.TestCase):
nginx_config = read_file('/etc/nginx/sites-enabled/default')
self.assertIn(f'listen {address}:{port} ssl;', nginx_config)
self.assertIn(f'ssl_protocols TLSv1.2 TLSv1.3;', nginx_config)
+ self.assertTrue(process_named_running(PROCESS_NAME))
def test_certificate(self):
self.cli_set(pki_base + ['certificate', 'test_https', 'certificate', cert_data.replace('\n','')])
@@ -97,6 +97,15 @@ class TestHTTPSService(VyOSUnitTestSHIM.TestCase):
self.cli_set(base_path + ['certificates', 'certificate', 'test_https'])
self.cli_commit()
+ self.assertTrue(process_named_running(PROCESS_NAME))
+
+ def test_api_missing_keys(self):
+ self.cli_set(base_path + ['api'])
+ self.assertRaises(ConfigSessionError, self.cli_commit)
+
+ def test_api_incomplete_key(self):
+ self.cli_set(base_path + ['api', 'keys', 'id', 'key-01'])
+ self.assertRaises(ConfigSessionError, self.cli_commit)
@ignore_warning(InsecureRequestWarning)
def test_api_auth(self):
@@ -339,4 +348,4 @@ class TestHTTPSService(VyOSUnitTestSHIM.TestCase):
if __name__ == '__main__':
- unittest.main(verbosity=2)
+ unittest.main(verbosity=5)