valitydev/yandex-tank
14
0
Fork 0
mirror of https://github.com/valitydev/yandex-tank.git synced 2024-11-06 02:15:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move default tank config into package

Browse Source
This commit is contained in:
Alexey Lavrenuke 2015-02-09 18:26:14 +03:00
parent 2969a70791
commit 87466efb97
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in Normal file
View File

@ -0,0 +1 @@
recursive-exclude tests *

9
setup.py
View File

@ -7,7 +7,7 @@ from setuptools import setup, find_packages
setup( setup(
name='yandextank', name='yandextank',
version='1.7.1', version='1.7.2',
description='a performance measurement tool', description='a performance measurement tool',
longer_description=''' longer_description='''
Yandex.Tank is a performance measurement and load testing automatization tool. Yandex.Tank is a performance measurement and load testing automatization tool.
@ -18,7 +18,8 @@ analytic tools for the results they produce.
maintainer='Alexey Lavrenuke (load testing)', maintainer='Alexey Lavrenuke (load testing)',
maintainer_email='direvius@yandex-team.ru', maintainer_email='direvius@yandex-team.ru',
url='http://yandex.github.io/yandex-tank/', url='http://yandex.github.io/yandex-tank/',
packages=find_packages(), packages=find_packages(exclude=["tests"]),
include_package_data=True,
install_requires=[ install_requires=[
'psutil', 'psutil',
'ipaddr', 'ipaddr',
@ -46,6 +47,7 @@ analytic tools for the results they produce.
], ],
}, },
package_data={ package_data={
'yandextank.core': ['config/*'],
'yandextank.plugins.GraphiteUploader': ['config/*'], 'yandextank.plugins.GraphiteUploader': ['config/*'],
'yandextank.plugins.JMeter': ['config/*'], 'yandextank.plugins.JMeter': ['config/*'],
'yandextank.plugins.Monitoring': ['config/*'], 'yandextank.plugins.Monitoring': ['config/*'],
@ -54,9 +56,6 @@ analytic tools for the results they produce.
}, },
# TODO: move them all to resources maybe # TODO: move them all to resources maybe
data_files=[ data_files=[
('/etc/yandex-tank', [
'config/00-base.ini',
]),
('/etc/bash_completion.d', [ ('/etc/bash_completion.d', [
'data/yandex-tank.completion' 'data/yandex-tank.completion'
]), ]),

0
config/00-base.ini → yandextank/core/config/00-base.ini
View File

5
yandextank/core/consoleworker.py
View File

@ -8,7 +8,7 @@ import time
import traceback import traceback
import signal import signal
from optparse import OptionParser from optparse import OptionParser
from pkg_resources import resource_file
from tankcore import TankCore from tankcore import TankCore
@ -151,7 +151,8 @@ class ConsoleTank:
def get_default_configs(self): def get_default_configs(self):
""" returns default configs list, from /etc and home dir """ """ returns default configs list, from /etc and home dir """
configs = [] # initialize basic defaults
configs = [resource_file(__name__, '00-base.ini')]
try: try:
conf_files = os.listdir(self.baseconfigs_location) conf_files = os.listdir(self.baseconfigs_location)
conf_files.sort() conf_files.sort()