Skip to content

remove flaky test from ci (SC-850) #1322

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.

Sign up for GitHub

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

Merged
TheRealFalcon merged 1 commit into from
Mar 8, 2022
Merged

remove flaky test from ci (SC-850) #1322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions tests/integration_tests/modules/test_combined.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,23 +145,6 @@ def test_runcmd(self, class_client: IntegrationInstance):
client = class_client
assert "hello world" == client.read_from_file("/var/tmp/runcmd_output")

@retry(tries=30, delay=1)
def test_ssh_import_id(self, class_client: IntegrationInstance):
"""Integration test for the ssh_import_id module.

This test specifies ssh keys to be imported by the ``ssh_import_id``
module and then checks that if the ssh keys were successfully imported.

TODO:
* This test assumes that SSH keys will be imported into the
/home/ubuntu; this will need modification to run on other OSes.
"""
client = class_client
ssh_output = client.read_from_file("/home/ubuntu/.ssh/authorized_keys")

assert "# ssh-import-id gh:powersj" in ssh_output
assert "# ssh-import-id lp:smoser" in ssh_output

def test_snap(self, class_client: IntegrationInstance):
"""Integration test for the snap module.

Expand Down Expand Up @@ -340,3 +323,23 @@ def test_instance_json_gce(self, class_client: IntegrationInstance):
assert v1_data["availability_zone"] == client.instance.zone
assert v1_data["instance_id"] == client.instance.instance_id
assert v1_data["local_hostname"] == client.instance.name


@pytest.mark.user_data(USER_DATA)
class TestCombinedNoCI:
@retry(tries=30, delay=1)
def test_ssh_import_id(self, class_client: IntegrationInstance):
"""Integration test for the ssh_import_id module.

This test specifies ssh keys to be imported by the ``ssh_import_id``
module and then checks that if the ssh keys were successfully imported.

TODO:
* This test assumes that SSH keys will be imported into the
/home/ubuntu; this will need modification to run on other OSes.
"""
client = class_client
ssh_output = client.read_from_file("/home/ubuntu/.ssh/authorized_keys")

assert "# ssh-import-id gh:powersj" in ssh_output
assert "# ssh-import-id lp:smoser" in ssh_output