Skip to content

Commit

Permalink
Merge 763acd9 into 89b986a
Browse files Browse the repository at this point in the history
  • Loading branch information
jframos committed Feb 3, 2015
2 parents 89b986a + 763acd9 commit f2f51f1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 133 deletions.
3 changes: 1 addition & 2 deletions ngsi_adapter/src/test/acceptance/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ that will provide all environment configurations for launching test cases.
1. Download and install Vagrant (https://www.vagrantup.com/downloads.html)
#. Go to *ngsi_adapter/src/test/acceptance* folder in the project
#. Execute *vagrant up* to launch a VM based on Vagrantfile provided.
#. After Vagrant provision, your VM is properly configured to launch acceptance tests. You have to access to the VM using
*vagrant ssh* and change to */vagrant* directory that will have mounted your workspace *(test/acceptance)*.
#. After Vagrant provision, your VM is properly configured to launch acceptance tests. You have to access to the VM using *vagrant ssh* and change to */vagrant* directory that will have mounted your workspace *(test/acceptance)*.

If you need more information about how to use Vagrant, you can see
`Vagrant Getting Started <https://docs.vagrantup.com/v2/getting-started/index.html>`_
Expand Down
9 changes: 8 additions & 1 deletion ngsi_adapter/src/test/acceptance/commons/logger_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import logging.config
import xml
import json
import os
from constants import HEADER_CONTENT_TYPE, HEADER_REPRESENTATION_XML, HEADER_REPRESENTATION_JSON

"""
Expand All @@ -37,8 +38,14 @@
LOG_CONSOLE_FORMATTER = " %(asctime)s - %(name)s - %(levelname)s - %(message)s"
LOG_FILE_FORMATTER = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"

# Console logging level. By default: ERROR

# By default, create the ./logs directory to store logs
if not os.path.exists("./logs"):
os.makedirs("./logs")

logging.config.fileConfig("./settings/logging.conf")

# Console logging level. By default: ERROR
logging_level = logging.ERROR


Expand Down

This file was deleted.

0 comments on commit f2f51f1

Please sign in to comment.