summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-02 22:58:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-02 22:58:43 +0000
commit84ad068f86b0c1d6fe40b33702777e460c7f9fe7 (patch)
tree6a6f41d99560be4cbbca3ffc3c82a94cefe80e2f
parent0b9ebff37d0be71e496892c72e513d774d8e7ced (diff)
parent214eca8785ac42af134e3c9b0453a1bb1077704d (diff)
Merge changes from topic 'convert_unix_format'
* changes: Change permissions of python files Convert files to Unix format
-rw-r--r--functest/ci/logging.json58
-rwxr-xr-x[-rw-r--r--]functest/opnfv_tests/vnf/aaa/aaa.py0
-rw-r--r--functest/tests/unit/test_logging.ini52
-rwxr-xr-x[-rw-r--r--]functest/utils/constants.py0
4 files changed, 55 insertions, 55 deletions
diff --git a/functest/ci/logging.json b/functest/ci/logging.json
index 3f454e8fa..2a2399d38 100644
--- a/functest/ci/logging.json
+++ b/functest/ci/logging.json
@@ -1,29 +1,29 @@
-{
- "version": 1,
- "disable_existing_loggers": false,
- "formatters": {
- "standard": {
- "format": "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
- }
- },
- "handlers": {
- "console": {
- "level": "INFO",
- "class": "logging.StreamHandler",
- "formatter": "standard"
- },
- "file": {
- "level": "DEBUG",
- "class": "logging.FileHandler",
- "formatter": "standard",
- "filename": "/home/opnfv/functest/results/functest.log"
- }
- },
- "loggers": {
- "": {
- "handlers": ["console", "file"],
- "level": "DEBUG",
- "propagate": "yes"
- }
- }
-}
+{
+ "version": 1,
+ "disable_existing_loggers": false,
+ "formatters": {
+ "standard": {
+ "format": "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+ }
+ },
+ "handlers": {
+ "console": {
+ "level": "INFO",
+ "class": "logging.StreamHandler",
+ "formatter": "standard"
+ },
+ "file": {
+ "level": "DEBUG",
+ "class": "logging.FileHandler",
+ "formatter": "standard",
+ "filename": "/home/opnfv/functest/results/functest.log"
+ }
+ },
+ "loggers": {
+ "": {
+ "handlers": ["console", "file"],
+ "level": "DEBUG",
+ "propagate": "yes"
+ }
+ }
+}
diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index f1c265f47..f1c265f47 100644..100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
diff --git a/functest/tests/unit/test_logging.ini b/functest/tests/unit/test_logging.ini
index 3d5b947c8..492767d16 100644
--- a/functest/tests/unit/test_logging.ini
+++ b/functest/tests/unit/test_logging.ini
@@ -1,27 +1,27 @@
-[loggers]
-keys=root,functest_logger
-
-[logger_root]
-level=DEBUG
-handlers=console
-
-[logger_functest_logger]
-level=DEBUG
-handlers=console
-qualname=functest.utils.functest_logger
-propagate=0
-
-[handlers]
-keys=console
-
-[handler_console]
-class=StreamHandler
-level=INFO
-formatter=standard
-args=(sys.stdout,)
-
-[formatters]
-keys=standard
-
-[formatter_standard]
+[loggers]
+keys=root,functest_logger
+
+[logger_root]
+level=DEBUG
+handlers=console
+
+[logger_functest_logger]
+level=DEBUG
+handlers=console
+qualname=functest.utils.functest_logger
+propagate=0
+
+[handlers]
+keys=console
+
+[handler_console]
+class=StreamHandler
+level=INFO
+formatter=standard
+args=(sys.stdout,)
+
+[formatters]
+keys=standard
+
+[formatter_standard]
format=%(asctime)s - %(name)s - %(levelname)s - %(message)s \ No newline at end of file
diff --git a/functest/utils/constants.py b/functest/utils/constants.py
index 2e8eb3f44..2e8eb3f44 100644..100755
--- a/functest/utils/constants.py
+++ b/functest/utils/constants.py