From aca78e9d94775ee1612aa8b9e6c5de88b15d18bd Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:14:20 +1000 Subject: [PATCH 1/6] Add requirement for coverage module --- Makefile | 3 --- requirements/build.txt | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1c603e178e..8cbab5355c 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,5 @@ setup: install migrate setup_ci: pip install -U -r requirements/build.txt -develop: - pip install -U -r requirements/dev.txt - superuser: python InvenTree/manage.py createsuperuser diff --git a/requirements/build.txt b/requirements/build.txt index c400442ceb..95991e6e2a 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,2 +1,3 @@ -r base.txt flake8==3.3.0 +coverage>=4.5.3 \ No newline at end of file From 5996a17eca50a76ace76859bf1583d1b14bf4c71 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:21:44 +1000 Subject: [PATCH 2/6] Ignore database migration files in coverage report --- .coveragerc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000000..bdb2148c43 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,4 @@ +[run] +omit = + # Do not run coverage on migration files + */migrations/* \ No newline at end of file From ff2ec3bfca126915e4091233b717e14ed0d9b65d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:22:21 +1000 Subject: [PATCH 3/6] Ignore generated reports --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index ead4b16409..ec0bae4220 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,7 @@ InvenTree/media # Ignore PyCharm project configuration .idea/ + +# Coverage reports +.coverage +htmlcov/ \ No newline at end of file From 4e7e2b72958e0f2df151344becf4e69de0a672da Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:24:45 +1000 Subject: [PATCH 4/6] Added source path to coveragerc --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index bdb2148c43..ed8dd1d86e 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,5 @@ [run] +source = ./InvenTree omit = # Do not run coverage on migration files */migrations/* \ No newline at end of file From fa46f14f5d4466f4b6746a44d312f64c088d930c Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:32:50 +1000 Subject: [PATCH 5/6] Run coveralls step after success --- .travis.yml | 3 +++ Makefile | 5 ++++- requirements/build.txt | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09f5fa6f2d..d714573be0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,6 @@ before_install: script: - make test - make style + +after-success: + - coveralls \ No newline at end of file diff --git a/Makefile b/Makefile index 8cbab5355c..831ab4ff3a 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,11 @@ style: flake8 InvenTree --ignore=C901,E501 test: + # Perform Django system checks python InvenTree/manage.py check - python InvenTree/manage.py test --noinput + + # Run the test framework (through coverage script) + coverage run InvenTree/manage.py test migrate: python InvenTree/manage.py makemigrations company diff --git a/requirements/build.txt b/requirements/build.txt index 95991e6e2a..9ec2467668 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,3 +1,4 @@ -r base.txt flake8==3.3.0 -coverage>=4.5.3 \ No newline at end of file +coverage>=4.5.3 +python-coveralls==2.9.1 \ No newline at end of file From 3ca5aba533504684bb050cfaaebbb264d932f7a6 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Apr 2019 15:36:45 +1000 Subject: [PATCH 6/6] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d714573be0..c386329854 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ script: - make test - make style -after-success: +after_success: - coveralls \ No newline at end of file