Skip to content

Commit 6e6aba9

Browse files
Enable parallel processing for tests
1 parent acce06d commit 6e6aba9

2 files changed

Lines changed: 17 additions & 11 deletions

File tree

.github/workflows/test-library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
4141
- name: Test with pytest
4242
run: |
43-
pytest -s --apikey ${{ secrets.TEST_ORG_API_KEY }} --o ${{ secrets.TEST_ORG_ID }}
43+
pytest --apikey ${{ secrets.TEST_ORG_API_KEY }} --o ${{ secrets.TEST_ORG_ID }}

tests/test_dashboard_api_python_library.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import pytest
22
import meraki
3+
import random
4+
import platform
35

46

57
@pytest.fixture(scope='session')
@@ -20,16 +22,23 @@ def org_id(pytestconfig):
2022

2123

2224
@pytest.fixture(scope='session')
23-
def network(dashboard, org_id):
25+
def version_salt():
26+
python_version = platform.python_version()
27+
salt = str(random.randint(1, 17381738))
28+
return f'{python_version} {salt}'
29+
30+
31+
@pytest.fixture(scope='session')
32+
def network(dashboard, org_id, version_salt):
2433
# Replace with network details
25-
name = "_GitHubAction Test Network"
26-
producttypes = ["appliance", "switch", "wireless", "systemsManager", "sensor"]
34+
name = f"_GitHubAction Test Network {version_salt}"
35+
product_types = ["appliance", "switch", "wireless", "systemsManager", "sensor"]
2736
network_kwargs = {
2837
"tags": ["test_tag", "github", "shouldBeDeleted"],
2938
"timezone": "America/Los_Angeles"
3039
}
3140

32-
created_network = dashboard.organizations.createOrganizationNetwork(org_id, name, producttypes, **network_kwargs)
41+
created_network = dashboard.organizations.createOrganizationNetwork(org_id, name, product_types, **network_kwargs)
3342
yield created_network
3443

3544

@@ -52,9 +61,9 @@ def test_get_organization(dashboard, org_id):
5261
assert isinstance(organization["id"], str)
5362

5463

55-
def test_create_network(dashboard, org_id, network):
64+
def test_create_network(dashboard, org_id, network, version_salt):
5665
assert network is not None
57-
assert network['name'] == "_GitHubAction Test Network"
66+
assert network['name'] == f"_GitHubAction Test Network {version_salt}"
5867

5968

6069
def test_get_networks(dashboard, org_id):
@@ -65,7 +74,7 @@ def test_get_networks(dashboard, org_id):
6574

6675
def test_update_network(dashboard, network):
6776
# Replace with updated network details
68-
new_name = "_GitHubAction Updated Test Network"
77+
new_name = f"{network['name']} new"
6978
updated_network_data = {
7079
"name": new_name,
7180
"tags": ["updated_test_tag", "github", "shouldBeDeleted"]
@@ -141,7 +150,6 @@ def test_create_network_appliance_vlan(dashboard, network):
141150

142151
def test_update_l3_firewall_rules(dashboard, org_id, network):
143152
policy_objects = dashboard.organizations.getOrganizationPolicyObjects(org_id)
144-
print(f'policy_objects length is {len(policy_objects)}')
145153
new_rules = {
146154
"rules": [
147155
{
@@ -169,8 +177,6 @@ def test_update_l3_firewall_rules(dashboard, org_id, network):
169177
updated_rules = dashboard.appliance.updateNetworkApplianceFirewallL3FirewallRules(network["id"],
170178
**new_rules)["rules"]
171179
assert updated_rules is not None
172-
print(f'new_rules["rules"] length is {len(new_rules["rules"])}')
173-
print(f'updated_rules length is {len(updated_rules)}')
174180
assert len(updated_rules) == 3
175181
assert updated_rules[0]["comment"] == "HamByIP"
176182
assert updated_rules[1]["comment"] == "Ham"

0 commit comments

Comments
 (0)