Skip to content

Commit

Permalink
Merge pull request #53 from nicholasmhughes/skip-pipeline-int-tests
Browse files Browse the repository at this point in the history
skip integration tests in pipeline for now
  • Loading branch information
nicholasmhughes authored Apr 23, 2024
2 parents 88d1fc4 + 8867bc5 commit 222333a
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/saltext/azurerm/utils/azurerm.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def _determine_auth(**kwargs):
if "client_id" in kwargs and "tenant" in kwargs and "secret" in kwargs:
credentials = get_identity_credentials(**kwargs)
else:
kwargs.pop("client_id")
kwargs.pop("client_id", None)
credentials = DefaultAzureCredential(authority=authority, **kwargs)
except ClientAuthenticationError:
raise SaltInvocationError( # pylint: disable=raise-missing-from
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_compute_availability_set.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=4)
def test_present(salt_call_cli, availability_set, resource_group, connection_auth):
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_compute_virtual_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.fixture(scope="session")
def password():
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_dns.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=3)
def test_zone_present(salt_call_cli, zone, resource_group, connection_auth):
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_keyvault_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.fixture(scope="session")
def key():
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_keyvault_secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.fixture(scope="session")
def secret():
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_keyvault_vault.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=3)
def test_present(
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_network_interface.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=4)
def test_present(
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_network_route.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=3)
def test_table_present(salt_call_cli, route_table, resource_group, connection_auth):
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_network_security_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.fixture(scope="session")
def nsg():
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_public_ip_address.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=3)
# Creates a public IP address with a "Standard" SKU for Bastion Host tests and another one with a "Basic" SKU
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_resource_group.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=1, before="test_changes_remove_tag")
def test_changes_add_tag(salt_call_cli, resource_group, location, tags, connection_auth):
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/states/test_virtual_network.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest

pytestmark = [
pytest.mark.destructive_test,
]


@pytest.mark.run(order=3)
def test_present(salt_call_cli, vnet, resource_group, location, connection_auth):
Expand Down

0 comments on commit 222333a

Please sign in to comment.