Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.15.z] Fix CaseAutomation for tests and delete Certificates related tests as part of component audit. #14902

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/foreman/api/test_discoveredhost.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def test_positive_auto_provision_all(
:expectedresults: All discovered hosts should be auto-provisioned
successfully
:CaseAutomation: NotAutomated
:CaseAutomation: Automated
:CaseImportance: High
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/api/test_operatingsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:Requirement: Provisioning

:CaseAutomation: NotAutomated
:CaseAutomation: Automated

:CaseComponent: Provisioning

Expand Down
4 changes: 3 additions & 1 deletion tests/foreman/api/test_provisioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:Requirement: Provisioning
:CaseAutomation: NotAutomated
:CaseAutomation: Automated
:CaseComponent: Provisioning
Expand Down Expand Up @@ -733,4 +733,6 @@ def test_rhel_provisioning_using_realm():
3. Host installs right version of RHEL
4. Satellite is able to run REX job on the host
5. Host is registered to Satellite and subscription status is 'Success'
:CaseAutomation: NotAutomated
"""
41 changes: 1 addition & 40 deletions tests/foreman/sys/test_katello_certs_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,28 +160,6 @@ def test_positive_validate_katello_certs_check_output(self, cert_setup_teardown)
result = target_sat.execute(command)
self.validate_output(result, cert_data)

@pytest.mark.tier1
def test_katello_certs_check_output_wildcard_inputs(self, cert_setup_teardown):
"""Validate that katello-certs-check generates correct output with wildcard certs.

:id: 7f9da806-5b23-11eb-b7ea-d46d6dd3b5b2

:steps:

1. Get valid wildcard certs from generate_certs
2. Run katello-certs-check with the required valid arguments
katello-certs-check -c CERT_FILE -k KEY_FILE -r REQ_FILE
-b CA_BUNDLE_FILE
3. Assert the output has correct commands with options

:expectedresults: katello-certs-check should generate correct commands
with options.
"""
cert_data, target_sat = cert_setup_teardown
command = 'katello-certs-check -c certs/wildcard.crt -k certs/wildcard.key -b certs/ca.crt'
result = target_sat.execute(command)
self.validate_output(result, cert_data)

@pytest.mark.parametrize(('error', 'cert_file', 'key_file', 'ca_file'), invalid_inputs)
@pytest.mark.tier1
def test_katello_certs_check_output_invalid_input(
Expand Down Expand Up @@ -237,7 +215,7 @@ def test_negative_check_expiration_of_certificate(self, cert_setup_teardown):

:expectedresults: Checking expiration of certificate check should fail.

:CaseAutomation: NotAutomated
:CaseAutomation: Automated
"""
cert_data, target_sat = cert_setup_teardown
hostname = target_sat.hostname
Expand Down Expand Up @@ -278,20 +256,3 @@ def test_negative_validate_certificate_subject(self):

:CaseAutomation: NotAutomated
"""

@pytest.mark.stubbed
@pytest.mark.tier1
def test_negative_check_private_key_match(self):
"""Validate private key match with certificate.

:id: 358edbb3-08b0-47d7-856b-ce0d5ea95979

:steps:

1. Have KEY_FILE with invalid private key
2. Run katello-certs-check with the required arguments

:expectedresults: Private key match with the certificate should fail.

:CaseAutomation: NotAutomated
"""
10 changes: 7 additions & 3 deletions tests/upgrades/test_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:Requirement: UpgradedSatellite

:CaseAutomation: NotAutomated
:CaseAutomation: Automated

:CaseComponent: UsersRoles

Expand Down Expand Up @@ -31,6 +31,8 @@ class TestOverriddenFilter:
1. The Filter should be have set override flag postupgrade
2. The locations and organizations of filter should be unchanged
postupgrade

:CaseAutomation: NotAutomated
"""

@pytest.mark.pre_upgrade
Expand Down Expand Up @@ -82,6 +84,8 @@ class TestBuiltInRolesLocked:

1. Builtin roles of satellite should be locked and non-editable
2. Built in roles of satellite should be allowed to clone

:CaseAutomation: NotAutomated
"""

@pytest.mark.post_upgrade
Expand Down Expand Up @@ -117,6 +121,8 @@ class TestNewOrganizationAdminRole:
non-editable
4. Organization Admin role of satellite should be allowed to clone
5. Taxonomies should be assigned to cloned org admin role

:CaseAutomation: NotAutomated
"""

@pytest.mark.post_upgrade
Expand Down Expand Up @@ -164,7 +170,6 @@ def test_pre_default_role_added_permission(self, target_sat):
:steps: New permission is added to existing 'Default role'

:expectedresults: Permission is added to existing 'Default role'.

"""
default_role = target_sat.api.Role().search(query={'search': 'name="Default role"'})[0]
subnet_filter = target_sat.api.Filter(
Expand Down Expand Up @@ -219,7 +224,6 @@ def test_pre_default_role_added_permission_with_filter(self, target_sat):

:expectedresults: Permission with filter is added to existing
'Default role'

"""
default_role = target_sat.api.Role().search(query={'search': 'name="Default role"'})[0]
domain_filter = target_sat.api.Filter(
Expand Down