From 83974d5656b816bf1ab0be3b58811a687bbfa65c Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 19 Aug 2015 01:30:07 -0400
Subject: [PATCH] Move travis-ci related settings files into their own module.

---
 .travis.yml                                        | 6 +++---
 mayan/settings/{travis => testing}/__init__.py     | 0
 mayan/settings/{travis => testing}/base.py         | 0
 mayan/settings/testing/travis/__init__.py          | 0
 mayan/settings/{ => testing}/travis/db_mysql.py    | 2 +-
 mayan/settings/{ => testing}/travis/db_postgres.py | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename mayan/settings/{travis => testing}/__init__.py (100%)
 rename mayan/settings/{travis => testing}/base.py (100%)
 create mode 100644 mayan/settings/testing/travis/__init__.py
 rename mayan/settings/{ => testing}/travis/db_mysql.py (86%)
 rename mayan/settings/{ => testing}/travis/db_postgres.py (87%)

diff --git a/.travis.yml b/.travis.yml
index 9161098614..dad79a4d83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ before_script:
   - mysql -e 'create database mayan_edms;'
   - psql -c 'create database mayan_edms;' -U postgres
 script:
-  - if [[ $DB == mysql ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.travis.db_mysql; fi
-  - if [[ $DB == postgres ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.travis.db_postgres; fi
-  - if [[ $DB == sqlite ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.travis.base; fi
+  - if [[ $DB == mysql ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.travis.db_mysql; fi
+  - if [[ $DB == postgres ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.travis.db_postgres; fi
+  - if [[ $DB == sqlite ]]; then coverage run manage.py test $TEST_APPS --settings=mayan.settings.testing.base; fi
 after_success:
   - coveralls
 branches:
diff --git a/mayan/settings/travis/__init__.py b/mayan/settings/testing/__init__.py
similarity index 100%
rename from mayan/settings/travis/__init__.py
rename to mayan/settings/testing/__init__.py
diff --git a/mayan/settings/travis/base.py b/mayan/settings/testing/base.py
similarity index 100%
rename from mayan/settings/travis/base.py
rename to mayan/settings/testing/base.py
diff --git a/mayan/settings/testing/travis/__init__.py b/mayan/settings/testing/travis/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mayan/settings/travis/db_mysql.py b/mayan/settings/testing/travis/db_mysql.py
similarity index 86%
rename from mayan/settings/travis/db_mysql.py
rename to mayan/settings/testing/travis/db_mysql.py
index 62a4fef251..8f2929b9f6 100644
--- a/mayan/settings/travis/db_mysql.py
+++ b/mayan/settings/testing/travis/db_mysql.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from .base import *  # NOQA
+from ..base import *  # NOQA
 
 DATABASES = {
     'default': {
diff --git a/mayan/settings/travis/db_postgres.py b/mayan/settings/testing/travis/db_postgres.py
similarity index 87%
rename from mayan/settings/travis/db_postgres.py
rename to mayan/settings/testing/travis/db_postgres.py
index cccc43a58d..08ba8bd109 100644
--- a/mayan/settings/travis/db_postgres.py
+++ b/mayan/settings/testing/travis/db_postgres.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from .base import *  # NOQA
+from ..base import *  # NOQA
 
 DATABASES = {
     'default': {