mirror of
https://github.com/OpenKMIP/PyKMIP.git
synced 2025-05-31 20:20:09 +02:00
Make unit tests use default config
This commit is contained in:
parent
bfa3c01893
commit
084fbcdb61
1
.github/workflows/.travis.yml
vendored
1
.github/workflows/.travis.yml
vendored
@ -10,6 +10,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
|
UNITTEST: ${{ true }}
|
||||||
TOXENV: ${{ matrix.test }}
|
TOXENV: ${{ matrix.test }}
|
||||||
RUN_INTEGRATION_TESTS: ${{ matrix.test_number}}
|
RUN_INTEGRATION_TESTS: ${{ matrix.test_number}}
|
||||||
steps:
|
steps:
|
||||||
|
21
.github/workflows/run_travis.yml
vendored
21
.github/workflows/run_travis.yml
vendored
@ -1,21 +0,0 @@
|
|||||||
name: "Run Travis.yml"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
name: test
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Run .travis.yml build script
|
|
||||||
uses: ktomk/run-travis-yml@v1.8.1
|
|
||||||
with:
|
|
||||||
file: .travis.yml
|
|
||||||
steps: |
|
|
||||||
install
|
|
||||||
script
|
|
||||||
allow-failure: false
|
|
@ -27,6 +27,8 @@ CONFIG_FILE = [
|
|||||||
os.path.normpath(os.path.join(FILE_PATH, '../pykmip.conf')),
|
os.path.normpath(os.path.join(FILE_PATH, '../pykmip.conf')),
|
||||||
os.path.normpath(os.path.join(FILE_PATH, '../kmipconfig.ini'))]
|
os.path.normpath(os.path.join(FILE_PATH, '../kmipconfig.ini'))]
|
||||||
|
|
||||||
|
if os.environ.get("UNITTEST"):
|
||||||
|
CONFIG_FILE = []
|
||||||
|
|
||||||
class ConfigHelper(object):
|
class ConfigHelper(object):
|
||||||
NONE_VALUE = 'None'
|
NONE_VALUE = 'None'
|
||||||
|
@ -128,8 +128,7 @@ class KmipSession(threading.Thread):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if hasattr(self._connection, 'shared_ciphers') \
|
if hasattr(self._connection, 'shared_ciphers') \
|
||||||
and self._connection.shared_ciphers() is not None:
|
and self._connection.shared_ciphers() is not None:
|
||||||
|
|
||||||
shared_ciphers = self._connection.shared_ciphers()
|
shared_ciphers = self._connection.shared_ciphers()
|
||||||
self._logger.debug(
|
self._logger.debug(
|
||||||
"Possible session ciphers: {0}".format(len(shared_ciphers))
|
"Possible session ciphers: {0}".format(len(shared_ciphers))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user