From 7b4f81e0b7b7cfcf08b77456c037baf3f810442b Mon Sep 17 00:00:00 2001 From: nanhe Date: Wed, 12 Oct 2022 16:51:44 +0800 Subject: [PATCH] add Action --- .github/workflows/testPython.yml | 27 +++++++++++++++++++++++++++ tests/test_client.py | 1 + tests/test_credentials.py | 9 +++++---- tests/test_model.py | 2 +- tests/test_providers.py | 11 ++++------- tests/test_util.py | 2 -- 6 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/testPython.yml diff --git a/.github/workflows/testPython.yml b/.github/workflows/testPython.yml new file mode 100644 index 0000000..9a794e8 --- /dev/null +++ b/.github/workflows/testPython.yml @@ -0,0 +1,27 @@ +name: Python Test + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [ 3.6, 3.7, 3.8, 3.9 ] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: pip install alibabacloud-tea coverage pytest + - name: Test with unittest + run: | + coverage run --source="./alibabcloud_credentials" -m pytest tests/ + - name: CodeCov + run: bash <(curl -s https://codecov.io/bash) -cF python \ No newline at end of file diff --git a/tests/test_client.py b/tests/test_client.py index 897837f..7a90039 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -6,6 +6,7 @@ from alibabacloud_credentials.client import Client from alibabacloud_credentials import credentials + class TestClient(unittest.TestCase): def test_client_ak(self): conf = Config() diff --git a/tests/test_credentials.py b/tests/test_credentials.py index 3437606..ba91b52 100644 --- a/tests/test_credentials.py +++ b/tests/test_credentials.py @@ -137,13 +137,14 @@ def test_CredentialsURICredential(self): cred = credentials.CredentialsURICredential( credentials_uri ) - self.assertEqual('access_key_id', cred.access_key_id) - self.assertEqual('access_key_secret', cred.access_key_secret) - self.assertEqual('security_token', cred.security_token) + self.assertIsNone(cred.access_key_id) + self.assertIsNone(cred.access_key_secret) + self.assertIsNone(cred.security_token) + self.assertEqual('http://localhost:6666/test', cred.credentials_uri) self.assertEqual('credentials_uri', cred.credential_type) def test_StsCredential(self): - access_key_id, access_key_secret, security_token =\ + access_key_id, access_key_secret, security_token = \ 'access_key_id', 'access_key_secret', 'security_token' cred = credentials.StsCredential( access_key_id, access_key_secret, security_token diff --git a/tests/test_model.py b/tests/test_model.py index f3fdd15..f52ebfc 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -20,4 +20,4 @@ def test_model_config(self): access_key_secret='access_key_secret' ) self.assertEqual('access_key_id', conf2.access_key_id) - self.assertEqual('access_key_secret', conf2.access_key_secret) \ No newline at end of file + self.assertEqual('access_key_secret', conf2.access_key_secret) diff --git a/tests/test_providers.py b/tests/test_providers.py index 296ebfc..e34dee8 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -1,10 +1,8 @@ import unittest -import json import time -import requests import asyncio -from alibabacloud_credentials.credentials import AccessKeyCredential +from Tea.exceptions import RetryError from alibabacloud_credentials import providers, models, credentials, exceptions from alibabacloud_credentials.utils import auth_util from . import ini_file @@ -175,6 +173,7 @@ async def main(): cred = await prov._create_credentials_async(turl='http://127.0.0.1:8888') self.assertEqual('AccessKeyId', cred.access_key_id) + loop.run_until_complete(main()) def test_RsaKeyPairCredentialProvider(self): @@ -221,6 +220,7 @@ async def main(): cred = await prov._create_credential_async(turl='http://127.0.0.1:8888') self.assertEqual('SessionAccessKeyId', cred.access_key_id) + loop.run_until_complete(main()) def test_ProfileCredentialsProvider(self): @@ -236,7 +236,7 @@ def test_ProfileCredentialsProvider(self): self.assertRaises(exceptions.CredentialException, prov.get_credentials) auth_util.client_type = 'client1' - self.assertRaises(requests.exceptions.ConnectTimeout, prov.get_credentials) + self.assertRaises(RetryError, prov.get_credentials) auth_util.client_type = 'client6' self.assertIsNone(prov.get_credentials()) @@ -268,6 +268,3 @@ def test_EnvironmentVariableCredentialsProvider(self): auth_util.environment_access_key_id = 'a' auth_util.environment_access_key_secret = '' self.assertRaises(exceptions.CredentialException, prov.get_credentials) - - - diff --git a/tests/test_util.py b/tests/test_util.py index e965fce..54141d8 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -29,5 +29,3 @@ def test_compose_url(test): test_compose_string_to_sign(self) test_sign_string(self) test_compose_url(self) - -