Skip to content

Commit

Permalink
Convert doctests -> unittests, add coverage testing
Browse files Browse the repository at this point in the history
python/*/test_*.py: mostly the same, some new tests after unittest-ification.
  reprs and exact strings of error messages are no longer as thoroughly tested.
setup.py: "python setup.py test" only tests with the current version
  of Python. We should probably move to tox for multi-version testing.
.*ignore: ignore .coverage files
.hgignore: factor out glob, has the bonus of making it match .gitignore better
  • Loading branch information
dmcc committed Oct 31, 2015
1 parent 2b31337 commit 53c412c
Show file tree
Hide file tree
Showing 7 changed files with 914 additions and 947 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ python/bllipparser/CharniakParser.py
python/bllipparser/JohnsonReranker.py
MANIFEST
bllipparser.egg-info
.coverage
132 changes: 67 additions & 65 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -1,65 +1,67 @@
glob:*.dep
glob:*.o
glob:*.a
glob:*.d
glob:second-stage/programs/*/read-tree.cc
glob:evalb/evalb
glob:first-stage/PARSE/parseIt
glob:first-stage/PARSE/fusion
glob:first-stage/PARSE/evalTree
glob:first-stage/PARSE/parseAndEval
glob:first-stage/TRAIN/iScale
glob:first-stage/TRAIN/kn3Counts
glob:first-stage/TRAIN/pSfgT
glob:first-stage/TRAIN/pSgT
glob:first-stage/TRAIN/pTgNt
glob:first-stage/TRAIN/pUgT
glob:first-stage/TRAIN/rCounts
glob:first-stage/TRAIN/selFeats
glob:first-stage/TRAIN/trainRs
glob:second-stage/programs/eval-beam/main
glob:second-stage/programs/eval-weights/best-indices
glob:second-stage/programs/eval-weights/best-parse
glob:second-stage/programs/eval-weights/best-parses
glob:second-stage/programs/eval-weights/eval-weights
glob:second-stage/programs/eval-weights/pretty-print
glob:second-stage/programs/features/best-*parses
glob:second-stage/programs/features/count-*features
glob:second-stage/programs/features/extract-*features
glob:second-stage/programs/features/oracle-score
glob:second-stage/programs/features/parallel-extract-nfeatures
glob:second-stage/programs/features/parallel-extract-spfeatures
glob:second-stage/programs/prepare-data/copy-trees-ss
glob:second-stage/programs/prepare-data/prepare-ec-data
glob:second-stage/programs/prepare-data/prepare-ec-data100
glob:second-stage/programs/prepare-data/prepare-new-data
glob:second-stage/programs/prepare-data/ptb
glob:second-stage/programs/wlle/avper
glob:second-stage/programs/wlle/cvlm
glob:second-stage/programs/wlle/cvlm-lbfgs
glob:second-stage/programs/wlle/gavper
glob:second-stage/programs/wlle/oracle
glob:*.sw[op]
glob:*.orig
glob:tags
glob:TAGS
glob:*.py[co]
glob:*.class
glob:*.so
glob:*_wrapper.cxx
glob:second-stage/programs/features/swig/*/lib/*
glob:second-stage/programs/features/swig/*/build/*
glob:first-stage/PARSE/swig/*/lib/*
glob:first-stage/PARSE/swig/*/build/*
glob:SParseval/*
glob:regression-test-*
glob:build*
glob:dist*
glob:first-stage/PARSE/parser_wrapper.C
glob:second-stage/programs/features/reranker_wrapper.C
glob:first-stage/PARSE/swig/wrapper.C
glob:second-stage/programs/features/swig/wrapper.C
glob:python/bllipparser/CharniakParser.py
glob:python/bllipparser/JohnsonReranker.py
glob:MANIFEST
glob:bllipparser.egg-info
syntax: glob
*.dep
*.o
*.a
*.d
second-stage/programs/*/read-tree.cc
evalb/evalb
first-stage/PARSE/parseIt
first-stage/PARSE/fusion
first-stage/PARSE/evalTree
first-stage/PARSE/parseAndEval
first-stage/TRAIN/iScale
first-stage/TRAIN/kn3Counts
first-stage/TRAIN/pSfgT
first-stage/TRAIN/pSgT
first-stage/TRAIN/pTgNt
first-stage/TRAIN/pUgT
first-stage/TRAIN/rCounts
first-stage/TRAIN/selFeats
first-stage/TRAIN/trainRs
second-stage/programs/eval-beam/main
second-stage/programs/eval-weights/best-indices
second-stage/programs/eval-weights/best-parse
second-stage/programs/eval-weights/best-parses
second-stage/programs/eval-weights/eval-weights
second-stage/programs/eval-weights/pretty-print
second-stage/programs/features/best-*parses
second-stage/programs/features/count-*features
second-stage/programs/features/extract-*features
second-stage/programs/features/oracle-score
second-stage/programs/features/parallel-extract-nfeatures
second-stage/programs/features/parallel-extract-spfeatures
second-stage/programs/prepare-data/copy-trees-ss
second-stage/programs/prepare-data/prepare-ec-data
second-stage/programs/prepare-data/prepare-ec-data100
second-stage/programs/prepare-data/prepare-new-data
second-stage/programs/prepare-data/ptb
second-stage/programs/wlle/avper
second-stage/programs/wlle/cvlm
second-stage/programs/wlle/cvlm-lbfgs
second-stage/programs/wlle/gavper
second-stage/programs/wlle/oracle
*.sw[op]
*.orig
tags
TAGS
*.py[co]
*.class
*.so
*_wrapper.cxx
second-stage/programs/features/swig/*/lib/*
second-stage/programs/features/swig/*/build/*
first-stage/PARSE/swig/*/lib/*
first-stage/PARSE/swig/*/build/*
SParseval/*
regression-test-*
build*
dist*
first-stage/PARSE/parser_wrapper.C
second-stage/programs/features/reranker_wrapper.C
first-stage/PARSE/swig/wrapper.C
second-stage/programs/features/swig/wrapper.C
python/bllipparser/CharniakParser.py
python/bllipparser/JohnsonReranker.py
MANIFEST
bllipparser.egg-info
.coverage
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ compiler: gcc
before_install:
- sudo add-apt-repository --yes ppa:ktm5j/uva-cs-ppa
- sudo apt-get update
install: sudo apt-get install libboost-dev liblbfgs-dev swig flex python-nose
install:
- sudo apt-get install libboost-dev liblbfgs-dev swig flex python-nose
- sudo pip install python-coveralls
before_script:
- swig -version
script:
Expand All @@ -14,3 +16,5 @@ script:
- make sparseval
- sudo python setup.py install
- nosetests --with-doctest -dv python/tests/
after_success:
- coveralls
2 changes: 1 addition & 1 deletion CHECKLIST.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Release checklist
0. Ensure tests are passing:
python setup.py test
Or manually:
nosetests-2.7 --with-doctest -dvx python/tests/
nosetests -dvx python/tests/
flake8 python/bllipparser/ParsingShell.py \
python/bllipparser/RerankingParser.py \
python/bllipparser/RerankerFeatureCorpus.py \
Expand Down

0 comments on commit 53c412c

Please sign in to comment.