Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…t-python into per_tenant_logging
  • Loading branch information
shaangill025 committed Aug 22, 2023
2 parents 08e02d5 + 94680bf commit 666f1ca
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nigthly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

publish:
name: Publish
needs: [setup_and_check_pub]
needs: [tests, setup_and_check_pub]
if: needs.setup_and_check_pub.outputs.commits_today > 0
uses: ./.github/workflows/publish.yml
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on: push
jobs:
snyk:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'hyperledger' }}
steps:
- uses: actions/checkout@v3
- name: Build a Docker image
Expand Down
5 changes: 1 addition & 4 deletions aries_cloudagent/admin/tests/test_admin_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import pytest
import mock as async_mock
from async_case import IsolatedAsyncioTestCase

from unittest import IsolatedAsyncioTestCase
from aiohttp import ClientSession, DummyCookieJar, TCPConnector, web
from aiohttp.test_utils import unused_port

Expand Down Expand Up @@ -334,7 +333,6 @@ async def test_visit_insecure_mode(self):

await server.stop()

@pytest.mark.skip(reason="async_case library not compatible with python 3.10")
async def test_visit_secure_mode(self):
settings = {
"admin.admin_insecure_mode": False,
Expand Down Expand Up @@ -387,7 +385,6 @@ async def test_visit_secure_mode(self):

await server.stop()

@pytest.mark.skip(reason="async_case library not compatible with python 3.10")
async def test_query_config(self):
settings = {
"admin.admin_insecure_mode": False,
Expand Down
2 changes: 1 addition & 1 deletion aries_cloudagent/core/tests/test_conductor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from io import StringIO

import mock as async_mock
from async_case import IsolatedAsyncioTestCase
from unittest import IsolatedAsyncioTestCase

from ...admin.base_server import BaseAdminServer
from ...config.base_context import ContextBuilder
Expand Down
2 changes: 1 addition & 1 deletion aries_cloudagent/core/tests/test_dispatcher.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json

from async_case import IsolatedAsyncioTestCase
from unittest import IsolatedAsyncioTestCase
import mock as async_mock
import pytest

Expand Down
2 changes: 1 addition & 1 deletion aries_cloudagent/core/tests/test_util.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from async_case import IsolatedAsyncioTestCase
from unittest import IsolatedAsyncioTestCase

from ...cache.base import BaseCache
from ...cache.in_memory import InMemoryCache
Expand Down
2 changes: 1 addition & 1 deletion aries_cloudagent/ledger/tests/test_routes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Tuple

from async_case import IsolatedAsyncioTestCase
from unittest import IsolatedAsyncioTestCase
import mock as async_mock

from ...core.in_memory import InMemoryProfile
Expand Down
2 changes: 1 addition & 1 deletion aries_cloudagent/wallet/tests/test_routes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mock as async_mock
import pytest
from aiohttp.web import HTTPForbidden
from async_case import IsolatedAsyncioTestCase
from unittest import IsolatedAsyncioTestCase

from ...admin.request_context import AdminRequestContext
from ...core.in_memory import InMemoryProfile
Expand Down
1 change: 0 additions & 1 deletion requirements.dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
asynctest==0.13.0
async-case~=10.1
pytest~=7.4.0
pytest-asyncio==0.14.0
pytest-cov==2.10.1
Expand Down

0 comments on commit 666f1ca

Please sign in to comment.