From 50a6d9617de5d449e4571470f5f8403234ed21d3 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 30 Oct 2015 11:15:38 +0900 Subject: [PATCH 1/3] Add tox configurations and requirements definitions --- .testr.conf | 8 ++++++ hooks/ceph_hooks.py | 4 +-- requirements/requirements-precise.txt | 6 +++++ requirements/requirements-trusty.txt | 7 ++++++ requirements/test-requirements.txt | 7 ++++++ tox.ini | 35 +++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 .testr.conf 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/.testr.conf b/.testr.conf new file mode 100644 index 0000000..801646b --- /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/hooks/ceph_hooks.py b/hooks/ceph_hooks.py index ccd575a..9d73363 100755 --- a/hooks/ceph_hooks.py +++ b/hooks/ceph_hooks.py @@ -146,8 +146,8 @@ def config_changed(): umount(e_mountpoint) osd_journal = config('osd-journal') - if (osd_journal and not os.path.exists(JOURNAL_ZAPPED) - and os.path.exists(osd_journal)): + if (osd_journal and not os.path.exists(JOURNAL_ZAPPED) and + os.path.exists(osd_journal)): ceph.zap_disk(osd_journal) with open(JOURNAL_ZAPPED, 'w') as zapped: zapped.write('DONE') diff --git a/requirements/requirements-precise.txt b/requirements/requirements-precise.txt new file mode 100644 index 0000000..21ee7d1 --- /dev/null +++ b/requirements/requirements-precise.txt @@ -0,0 +1,6 @@ +PyYAML==3.10 +simplejson==2.3.2 +netifaces==0.8 +netaddr==0.7.10 +Jinja2==2.6 +six==1.1.0 diff --git a/requirements/requirements-trusty.txt b/requirements/requirements-trusty.txt new file mode 100644 index 0000000..b73a7e4 --- /dev/null +++ b/requirements/requirements-trusty.txt @@ -0,0 +1,7 @@ +PyYAML>=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 0000000..ff4fb63 --- /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 0000000..e9cf1d5 --- /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 From e83d3114126e4079188caae493f2b6a2dc9fd593 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 30 Oct 2015 12:30:49 +0900 Subject: [PATCH 2/3] Make things alot simpler --- .../requirements-trusty.txt => requirements.txt | 0 requirements/requirements-precise.txt | 6 ------ ...st-requirements.txt => test-requirements.txt | 0 tox.ini | 17 ++++++----------- 4 files changed, 6 insertions(+), 17 deletions(-) rename requirements/requirements-trusty.txt => requirements.txt (100%) delete mode 100644 requirements/requirements-precise.txt rename requirements/test-requirements.txt => test-requirements.txt (100%) diff --git a/requirements/requirements-trusty.txt b/requirements.txt similarity index 100% rename from requirements/requirements-trusty.txt rename to requirements.txt diff --git a/requirements/requirements-precise.txt b/requirements/requirements-precise.txt deleted file mode 100644 index 21ee7d1..0000000 --- a/requirements/requirements-precise.txt +++ /dev/null @@ -1,6 +0,0 @@ -PyYAML==3.10 -simplejson==2.3.2 -netifaces==0.8 -netaddr==0.7.10 -Jinja2==2.6 -six==1.1.0 diff --git a/requirements/test-requirements.txt b/test-requirements.txt similarity index 100% rename from requirements/test-requirements.txt rename to test-requirements.txt diff --git a/tox.ini b/tox.ini index e9cf1d5..6bdf575 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] # Default to current LTS -envlist = lint,py27-trusty +envlist = lint,py27 skipsdist = True [testenv] @@ -10,20 +10,15 @@ install_command = pip install --allow-unverified python-apt {opts} {packages} commands = ostestr {posargs} -[testenv:py27-precise] +[testenv:py27] 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 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt [testenv:lint] basepython = python2.7 -deps = -r{toxinidir}/requirements/requirements-trusty.txt - -r{toxinidir}/requirements/test-requirements.txt +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = flake8 {posargs} hooks unit_tests tests charm proof From 235860c60efcc7a29a72af7f09dd91036c6e8239 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 30 Oct 2015 15:04:43 +0900 Subject: [PATCH 3/3] Resync tox integration --- requirements.txt | 18 +++++++++++------- test-requirements.txt | 13 +++++++------ tox.ini | 1 - 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index b73a7e4..426002d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,11 @@ -PyYAML>=3.10 -simplejson>=3.3.1 -netifaces>=0.8 -netaddr>=0.7.10 -Jinja2>=2.7.2 -six>=1.5.2 -dnspython +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +PyYAML>=3.1.0 +simplejson>=2.2.0 +netifaces>=0.10.4 +netaddr>=0.7.12,!=0.7.16 +Jinja2>=2.6 # BSD License (3 clause) +six>=1.9.0 +dnspython>=1.12.0 +psutil>=1.1.1,<2.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index ff4fb63..3af44d7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,8 @@ -testtools -coverage -mock -flake8==2.1.0 -# No version required +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +coverage>=3.6 +mock>=1.2 +flake8>=2.2.4,<=2.4.1 +os-testr>=0.4.1 charm-tools -os-testr diff --git a/tox.ini b/tox.ini index 6bdf575..4e328e4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,4 @@ [tox] -# Default to current LTS envlist = lint,py27 skipsdist = True