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

fix deploy and check scripts; enable disabled tests #1474

Merged
merged 1 commit into from
Jul 6, 2020
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: 2 additions & 0 deletions scripts/check_package_versions_in_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ def __init__(self, file: Path, package_id: PackageId, match_obj, *args):
DEFAULT_CONFIG_FILE_PATHS = [
Path("aea", "connections", "stub", "connection.yaml"),
Path("aea", "protocols", "default", "protocol.yaml"),
Path("aea", "protocols", "signing", "protocol.yaml"),
Path("aea", "protocols", "state_update", "protocol.yaml"),
Path("aea", "skills", "error", "skill.yaml"),
]

Expand Down
2 changes: 2 additions & 0 deletions scripts/deploy_to_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
DEFAULT_CONFIG_FILE_PATHS = [
Path("aea", "connections", "stub", "connection.yaml"),
Path("aea", "protocols", "default", "protocol.yaml"),
Path("aea", "protocols", "signing", "protocol.yaml"),
Path("aea", "protocols", "state_update", "protocol.yaml"),
Path("aea", "skills", "error", "skill.yaml"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about ledger connection and ledger_api/contract_api protocols?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe in a separate PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they are not in the aea package so not relevant.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should they, though?

]

Expand Down
1 change: 0 additions & 1 deletion tests/test_cli/test_add/test_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ def teardown_class(cls):


@pytest.mark.integration
@pytest.mark.unstable
class TestAddConnectionFromRemoteRegistry(AEATestCaseEmpty):
"""Test case for add connection from Registry command."""

Expand Down
1 change: 0 additions & 1 deletion tests/test_cli/test_add/test_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def test_add_contract_positive(self, *mocks):


@pytest.mark.integration
@pytest.mark.unstable
class TestAddContractFromRemoteRegistry(AEATestCaseEmpty):
"""Test case for add contract from Registry command."""

Expand Down
1 change: 0 additions & 1 deletion tests/test_cli/test_add/test_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ def teardown_class(cls):


@pytest.mark.integration
@pytest.mark.unstable
class TestAddProtocolFromRemoteRegistry(AEATestCaseEmpty):
"""Test case for add protocol from Registry command."""

Expand Down
3 changes: 1 addition & 2 deletions tests/test_cli/test_add/test_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,14 +497,13 @@ def test_add_skill_with_contracts_positive(self):


@pytest.mark.integration
@pytest.mark.unstable
class TestAddSkillFromRemoteRegistry(AEATestCaseEmpty):
"""Test case for add skill from Registry command."""

@pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS)
def test_add_skill_from_remote_registry_positive(self):
"""Test add skill from Registry positive result."""
self.add_item("skill", "fetchai/echo:0.1.0", local=False)
self.add_item("skill", "fetchai/echo:0.3.0", local=False)

items_path = os.path.join(self.agent_name, "vendor", "fetchai", "skills")
items_folders = os.listdir(items_path)
Expand Down
3 changes: 1 addition & 2 deletions tests/test_cli/test_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,11 @@ def test__is_version_correct_negative(self):


@pytest.mark.integration
@pytest.mark.unstable
class TestFetchFromRemoteRegistry(AEATestCaseMany):
"""Test case for fetch agent command from Registry."""

@pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS)
def test_fetch_agent_from_remote_registry_positive(self):
"""Test fetch agent from Registry for positive result."""
self.run_cli_command("fetch", "fetchai/my_first_aea:0.1.0")
self.run_cli_command("fetch", "fetchai/my_first_aea:0.6.0")
assert "my_first_aea" in os.listdir(self.t)
1 change: 0 additions & 1 deletion tests/test_cli/test_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
)


@pytest.mark.unstable
@pytest.mark.integration
class TestGui:
"""Test that the command 'aea gui' works as expected."""
Expand Down