kamikazechaser
/
cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rehabilitate tests after merge

This commit is contained in:
nolash 2021-08-17 09:44:52 +02:00
parent d00af34528
commit e80e5fb8dc
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/cic-eth/cic_eth/data/config/redis.ini
View File

@ -1,15 +1,5 @@
[redis] [redis]
host = localhost host = localhost
<<<<<<< HEAD
port = 6379 port = 6379
db = 0 db = 0
timeout = 20.0 timeout = 20.0
=======
<<<<<<<< HEAD:apps/cic-eth/config/docker/redis.ini
port = 63379
========
port = 6379
db = 0
timeout = 20.0
>>>>>>>> origin/master:apps/cic-eth/cic_eth/data/config/redis.ini
>>>>>>> origin/master

2
apps/cic-eth/requirements.txt
View File

@ -1,3 +1,3 @@
celery==4.4.7 celery==4.4.7
chainlib-eth>=0.0.7a4,<0.1.0 chainlib-eth>=0.0.7a5,<0.1.0
semver==2.13.0 semver==2.13.0

0
apps/cic-eth/tests/unit/ext/test_ext_tx.py → apps/cic-eth/tests/task/test_ext_tx.py
View File

10
apps/cic-eth/tests/unit/cli/test_cli_args.py
View File

@ -1,5 +1,6 @@
# standard imports # standard imports
import os import os
import logging
# external imports # external imports
import chainlib.cli import chainlib.cli
@ -7,11 +8,13 @@ import chainlib.cli
# local imports # local imports
import cic_eth.cli import cic_eth.cli
logg = logging.getLogger()
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(script_dir, '..', '..', 'testdata', 'config') #config_dir = os.path.join(script_dir, '..', '..', 'testdata', 'config')
def test_argumentparserto_config(): def test_argumentparser_to_config():
argparser = cic_eth.cli.ArgumentParser() argparser = cic_eth.cli.ArgumentParser()
@ -36,7 +39,8 @@ def test_argumentparserto_config():
extra_args = { extra_args = {
'foo': '_BARBARBAR', 'foo': '_BARBARBAR',
} }
config = cic_eth.cli.Config.from_args(args, chainlib.cli.argflag_std_base, local_flags, extra_args=extra_args, base_config_dir=config_dir) #config = cic_eth.cli.Config.from_args(args, chainlib.cli.argflag_std_base, local_flags, extra_args=extra_args, base_config_dir=config_dir)
config = cic_eth.cli.Config.from_args(args, chainlib.cli.argflag_std_base, local_flags, extra_args=extra_args)
assert config.get('_BARBARBAR') == 'bar' assert config.get('_BARBARBAR') == 'bar'
assert config.get('REDIS_HOST') == 'foo' assert config.get('REDIS_HOST') == 'foo'