From 7b4a89a33388287a251c8f18bf7d3347d6f50124 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 30 Oct 2015 11:22:54 +0900 Subject: [PATCH] Add tox support --- .bzrignore | 1 + .testr.conf | 8 ++++++ .testrepository/0 | 28 +++++++++++++++++++++ .testrepository/1 | 28 +++++++++++++++++++++ .testrepository/failing | 0 .testrepository/format | 1 + .testrepository/next-stream | 1 + .testrepository/times.dbm | Bin 0 -> 12288 bytes hooks/ceph_hooks.py | 6 ++--- requirements/requirements-precise.txt | 6 +++++ requirements/requirements-trusty.txt | 7 ++++++ requirements/test-requirements.txt | 7 ++++++ tox.ini | 35 ++++++++++++++++++++++++++ 13 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 .testr.conf create mode 100644 .testrepository/0 create mode 100644 .testrepository/1 create mode 100644 .testrepository/failing create mode 100644 .testrepository/format create mode 100644 .testrepository/next-stream create mode 100644 .testrepository/times.dbm create mode 100644 requirements/requirements-precise.txt create mode 100644 requirements/requirements-trusty.txt create mode 100644 requirements/test-requirements.txt create mode 100644 tox.ini diff --git a/.bzrignore b/.bzrignore index df8ebfbf..6ae62c65 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,3 +1,4 @@ .coverage .project +.tox bin diff --git a/.testr.conf b/.testr.conf new file mode 100644 index 00000000..801646bb --- /dev/null +++ b/.testr.conf @@ -0,0 +1,8 @@ +[DEFAULT] +test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ + OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ + OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ + ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION + +test_id_option=--load-list $IDFILE +test_list_option=--list diff --git a/.testrepository/0 b/.testrepository/0 new file mode 100644 index 00000000..9bf1a840 --- /dev/null +++ b/.testrepository/0 @@ -0,0 +1,28 @@ +time: 2015-10-30 02:21:00.720250Z +tags: worker-0 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_disks +time: 2015-10-30 02:21:00.754778Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_disks [ multipart +] +tags: -worker-0 +time: 2015-10-30 02:21:00.730741Z +tags: worker-1 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_relation_incomplete +time: 2015-10-30 02:21:00.758154Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_relation_incomplete [ multipart +] +tags: -worker-1 +time: 2015-10-30 02:21:00.743827Z +tags: worker-2 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_no_monitor_relation +time: 2015-10-30 02:21:00.772254Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_no_monitor_relation [ multipart +] +tags: -worker-2 +time: 2015-10-30 02:21:00.755015Z +tags: worker-3 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_no_disks +time: 2015-10-30 02:21:00.786637Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_no_disks [ multipart +] +tags: -worker-3 diff --git a/.testrepository/1 b/.testrepository/1 new file mode 100644 index 00000000..4b986ba9 --- /dev/null +++ b/.testrepository/1 @@ -0,0 +1,28 @@ +time: 2015-10-30 02:22:03.291297Z +tags: worker-0 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_disks +time: 2015-10-30 02:22:03.320167Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_disks [ multipart +] +tags: -worker-0 +time: 2015-10-30 02:22:03.297768Z +tags: worker-3 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_relation_incomplete +time: 2015-10-30 02:22:03.324847Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_relation_incomplete [ multipart +] +tags: -worker-3 +time: 2015-10-30 02:22:03.309743Z +tags: worker-2 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_no_monitor_relation +time: 2015-10-30 02:22:03.338165Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_no_monitor_relation [ multipart +] +tags: -worker-2 +time: 2015-10-30 02:22:03.304786Z +tags: worker-1 +test: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_no_disks +time: 2015-10-30 02:22:03.342692Z +successful: unit_tests.test_status.ServiceStatusTestCase.test_assess_status_monitor_complete_no_disks [ multipart +] +tags: -worker-1 diff --git a/.testrepository/failing b/.testrepository/failing new file mode 100644 index 00000000..e69de29b diff --git a/.testrepository/format b/.testrepository/format new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/.testrepository/format @@ -0,0 +1 @@ +1 diff --git a/.testrepository/next-stream b/.testrepository/next-stream new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/.testrepository/next-stream @@ -0,0 +1 @@ +2 diff --git a/.testrepository/times.dbm b/.testrepository/times.dbm new file mode 100644 index 0000000000000000000000000000000000000000..a2a93fd6cff6dded6b92b259c174ca5229f2c29d GIT binary patch literal 12288 zcmeI%ze>a~9KiAPhC_#5Tm%;%!BVT(yF~;C!S$Rklrv!Qu9YU|Te!M72`)a4tDCD& zVbWf}6Sq6W;akZ6@Jsn*N+N_1kxTw7cKc%6S9V<5@)aR^U9plso?VIq*E8AMe~%Bl zAs-{e36tL*ZYIC=hjB^-5I_I{1Q0*~0R#|0009IL_&b50XY{`K7>M{)KFbSvDnAFV z#fJa_2q1s}0tg_000IagfWW^Nh@vz}v*B@;MT@Gm%4%ax;&WweVHYMD>*l_k>T%n; zas%gu(cO%~7;VgQqN-{&uU(9~QH`DzwyY~3{3su#Cu;`}k*D?iZl=3.10 +simplejson>=3.3.1 +netifaces>=0.8 +netaddr>=0.7.10 +Jinja2>=2.7.2 +six>=1.5.2 +dnspython diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt new file mode 100644 index 00000000..ff4fb63b --- /dev/null +++ b/requirements/test-requirements.txt @@ -0,0 +1,7 @@ +testtools +coverage +mock +flake8==2.1.0 +# No version required +charm-tools +os-testr diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..e9cf1d53 --- /dev/null +++ b/tox.ini @@ -0,0 +1,35 @@ +[tox] +# Default to current LTS +envlist = lint,py27-trusty +skipsdist = True + +[testenv] +setenv = VIRTUAL_ENV={envdir} + PYTHONHASHSEED=0 +install_command = + pip install --allow-unverified python-apt {opts} {packages} +commands = ostestr {posargs} + +[testenv:py27-precise] +basepython = python2.7 +deps = -r{toxinidir}/requirements/requirements-precise.txt + -r{toxinidir}/requirements/test-requirements.txt + +[testenv:py27-trusty] +basepython = python2.7 +deps = -r{toxinidir}/requirements/requirements-trusty.txt + -r{toxinidir}/requirements/test-requirements.txt + +[testenv:lint] +basepython = python2.7 +deps = -r{toxinidir}/requirements/requirements-trusty.txt + -r{toxinidir}/requirements/test-requirements.txt +commands = flake8 {posargs} hooks unit_tests tests + charm proof + +[testenv:venv] +commands = {posargs} + +[flake8] +ignore = E402,E226 +exclude = hooks/charmhelpers