Skip to content
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ testunit:

.PHONY: smoketest
smoketest:
$(PYTHON) -m pytest -m smoke test/integration --disable-warnings
$(PYTHON) -m pytest -m smoke test/integration
7 changes: 7 additions & 0 deletions test/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,3 +341,10 @@ def create_multiple_vpcs(test_linode_client):
vpc_1.delete()

vpc_2.delete()


@pytest.mark.smoke
def pytest_configure(config):
config.addinivalue_line(
"markers", "smoke: mark test as part of smoke test suite"
)
5 changes: 1 addition & 4 deletions test/integration/linode_client/test_linode_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_get_account(setup_client_and_linode):
assert re.search("^$|[a-zA-Z]+", account.first_name)
assert re.search("^$|[a-zA-Z]+", account.last_name)
assert re.search(
"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$", account.email
"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$", account.email
)
assert re.search("^$|[a-zA-Z0-9]+", account.address_1)
assert re.search("^$|[a-zA-Z0-9]+", account.address_2)
Expand Down Expand Up @@ -401,9 +401,6 @@ def test_keys_create(test_linode_client, ssh_keys_object_storage):

# NetworkingGroupTests

# TODO:: creating vlans
# def test_get_vlans():


@pytest.fixture
def create_firewall_with_inbound_outbound_rules(test_linode_client):
Expand Down
3 changes: 0 additions & 3 deletions test/integration/models/test_linode.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ def linode_for_disk_tests(test_linode_client):
linode_instance.delete()


@pytest.mark.smoke
@pytest.fixture
def create_linode_for_long_running_tests(test_linode_client):
client = test_linode_client
Expand Down Expand Up @@ -372,7 +371,6 @@ def wait_for_disk_status(disk: Disk, timeout):
raise TimeoutError("Wait for condition timeout error")


@pytest.mark.dependency()
def test_disk_resize_and_duplicate(test_linode_client, linode_for_disk_tests):
linode = linode_for_disk_tests

Expand All @@ -396,7 +394,6 @@ def test_disk_resize_and_duplicate(test_linode_client, linode_for_disk_tests):
assert dup_disk.linode_id == linode.id


@pytest.mark.dependency(depends=["test_disk_resize_and_duplicate"])
def test_linode_create_disk(test_linode_client, linode_for_disk_tests):
linode = test_linode_client.load(Instance, linode_for_disk_tests.id)

Expand Down
2 changes: 1 addition & 1 deletion tod_scripts