Rehabilitate tests after merge

apps/cic-eth/cic_eth/data/config/redis.ini

@@ -1,15 +1,5 @@
 [redis]
 host = localhost
-<<<<<<< HEAD
 port = 6379
 db = 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

apps/cic-eth/requirements.txt

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

apps/cic-eth/tests/unit/cli/test_cli_args.py

@@ -1,5 +1,6 @@
 # standard imports
 import os
+import logging
 
 # external imports
 import chainlib.cli 
@@ -7,11 +8,13 @@ import chainlib.cli
 # local imports
 import cic_eth.cli
 
+logg = logging.getLogger()
+
 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()
     
@@ -36,7 +39,8 @@ def test_argumentparserto_config():
     extra_args = {
             '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('REDIS_HOST') == 'foo'