Skip to content

Commit

Permalink
Work on tests and infra.
Browse files Browse the repository at this point in the history
  • Loading branch information
sfermigier committed Aug 2, 2017
1 parent 7166f78 commit 634be00
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ SRC=abilian
# The package name
PKG=abilian

# On a 4 core laptop, 2 is optimal
NCPU=2
# FIXME: We have a parallelism issue with soffice conversion
# NCPU ?= $(shell sysctl -n hw.ncpu || echo 1)
NCPU=1

# pytest-sugar seems to be incompatible with pytest-xdist
# -s: no terminal capture.
PYTEST_MULTI=-n $(NCPU) -p no:sugar -s
# PYTEST_MULTI=-n $(NCPU) -p no:sugar -s
PYTEST_MULTI=-n $(NCPU)


all: test lint
Expand Down
11 changes: 11 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# TODO

## Python 3 & deps upgrades

- [] Upgrade Flaks-WTF to 0.13 and fix metaclass error
- [] Ugrade flask-sqlalchemy and other SQLA releated deps
- [] Fix all tests (including skipped ones) under Python 3.6

## Other

See: <https://github.com/abilian/abilian-core/projects/1>
6 changes: 0 additions & 6 deletions TODO.txt

This file was deleted.

6 changes: 2 additions & 4 deletions abilian/core/models/tests/test_blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,8 @@ def test_value(self):
session.delete(b)
# object marked for deletion, but instance attribute should still be
# readable
assert session_repository.get(
b,
b.uuid,
).open('rb').read() == content
fd = session_repository.get(b, b.uuid, ).open('rb')
assert fd.read() == content

# commit in transaction: session_repository has no content, 'physical'
# repository still has content
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ commands =
pip install -e .[dev]

# Run tests
py.test --tb=short --junitxml=junit-{envname}.xml abilian tests
py.test --tb=short --junitxml=junit-{envname}.xml .

# Run lint
make lint-ci
Expand Down

0 comments on commit 634be00

Please sign in to comment.