Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-02 21:11:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'upgrade-python-for-1.10' of https://github.com/danfengliu/harbor into upgrade-python-for-1.10

Browse Source
This commit is contained in:
danfengliu 2020-09-07 16:02:12 +08:00
commit 10be591f14
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -454,7 +454,7 @@ swagger_client:
wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar -O openapi-generator-cli.jar wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar -O openapi-generator-cli.jar
rm -rf harborclient rm -rf harborclient
mkdir harborclient mkdir harborclient
java -jar openapi-generator-cli.jar generate -i api/harbor/swagger.yaml -g python -o harborclient java -jar openapi-generator-cli.jar generate -i api/harbor/swagger.yaml -g python -o harborclient --package-name swagger_client
cd harborclient; python ./setup.py install cd harborclient; python ./setup.py install
pip install docker -q pip install docker -q
pip freeze pip freeze

2
tests/apitests/python/library/repository.py
View File

@ -110,7 +110,7 @@ class Repository(base.Base):
_tag = self.get_tag(repo_name, tag, **kwargs) _tag = self.get_tag(repo_name, tag, **kwargs)
if _tag.name == tag and _tag.scan_overview != None: if _tag.name == tag and _tag.scan_overview != None:
for report in _tag.scan_overview.values(): for report in _tag.scan_overview.values():
if report.get('scan_status') == expected_scan_status: if report.scan_status == expected_scan_status:
return return
raise Exception("Scan image result is not as expected {}.".format(expected_scan_status)) raise Exception("Scan image result is not as expected {}.".format(expected_scan_status))

2
tests/apitests/python/library/system.py
View File

@ -177,7 +177,7 @@ class System(base.Base):
except Exception as e: except Exception as e:
base._assert_status_code(expected_status_code, e.status) base._assert_status_code(expected_status_code, e.status)
else: else:
base._assert_status_code(expected_status_code, r[1]) base._assert_status_code(expected_status_code, r.status)
def get_cve_whitelist(self, **kwargs): def get_cve_whitelist(self, **kwargs):
client = self._get_client(**kwargs) client = self._get_client(**kwargs)