Skip to content
This repository has been archived by the owner on Sep 18, 2018. It is now read-only.

Commit

Permalink
Merge pull request #217 from fizyk/pytest-mysql
Browse files Browse the repository at this point in the history
replaced mysql related code with pulgin out of extracted source
  • Loading branch information
fizyk committed Nov 15, 2016
2 parents 684d45b + e615b6b commit 2ac05cc
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 333 deletions.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -69,7 +69,7 @@ def read(fname):
'pytest-xdist==1.15.0',
'Mock==2.0.0',
],
'mysql': ['mysqlclient'],
'mysql': ['pytest-mysql'],
'postgresql': ['pytest-postgresql'],
'mongodb': ['pytest-mongo'],
'elasticsearch': ['pytest-elasticsearch'],
Expand Down
12 changes: 0 additions & 12 deletions src/pytest_dbfixtures/conf/dbfixtures.conf
Expand Up @@ -11,15 +11,3 @@ rabbit:
params: ''
host: '127.0.0.1'
port: 5673

mysql:
mysql_init: /usr/bin/mysql_install_db
mysql_server: /usr/bin/mysqld_safe
mysql_admin: /usr/bin/mysqladmin
mysql_client: /usr/bin/mysql
host: 'localhost'
port: 3307
db: tests
user: root
password: ''
params: ''
3 changes: 0 additions & 3 deletions src/pytest_dbfixtures/factories/__init__.py
Expand Up @@ -18,14 +18,11 @@
# along with pytest-dbfixtures. If not, see <http://www.gnu.org/licenses/>.

from pytest_dbfixtures.factories.redis import redis_proc, redisdb
from pytest_dbfixtures.factories.mysql import mysql_proc
from pytest_dbfixtures.factories.mysql_client import mysql
from pytest_dbfixtures.factories.rabbitmq import rabbitmq_proc
from pytest_dbfixtures.factories.rabbitmq_client import rabbitmq


__all__ = [
redis_proc, redisdb,
mysql_proc, mysql,
rabbitmq, rabbitmq_proc,
]
158 changes: 0 additions & 158 deletions src/pytest_dbfixtures/factories/mysql.py

This file was deleted.

100 changes: 0 additions & 100 deletions src/pytest_dbfixtures/factories/mysql_client.py

This file was deleted.

17 changes: 0 additions & 17 deletions src/pytest_dbfixtures/plugin.py
Expand Up @@ -15,11 +15,7 @@

# You should have received a copy of the GNU Lesser General Public License
# along with pytest-dbfixtures. If not, see <http://www.gnu.org/licenses/>.
import warnings


from path import path
import pytest

from pytest_dbfixtures import factories

Expand Down Expand Up @@ -84,19 +80,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
redis_proc = factories.redis_proc()
redisdb = factories.redisdb('redis_proc')

mysql_proc = factories.mysql_proc()
mysql = factories.mysql('mysql_proc')


@pytest.fixture
def mysqldb(mysql):
warnings.warn(
'`mysqldb` fixture is deprecated. Please use `mysql` instead.',
DeprecationWarning,
2
)
return mysql


rabbitmq_proc = factories.rabbitmq_proc()
rabbitmq = factories.rabbitmq('rabbitmq_proc')
42 changes: 0 additions & 42 deletions tests/test_mysql.py

This file was deleted.

0 comments on commit 2ac05cc

Please sign in to comment.