[Pkg-mongodb-maintainers] [pkg-mongodb] 13/19: Use resmoke to run all tests

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 39a472bc5ff0b5256833190d8d4a74917d338e6f
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Dec 15 00:22:31 2016 +0200

    Use resmoke to run all tests
    
    B-D on python-yaml for resmoke.py to work. Also B-D on
    python-subprocess32 per resmoke's suggestion.
    
    This properly runs the test suite in 3.2.
---
 debian/clean   | 2 --
 debian/control | 2 ++
 debian/rules   | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/clean b/debian/clean
index 08d601e..1f6ddc0 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,8 +1,6 @@
 debian/tmp-test/
 .scons/
 build/
-failfile.smoke
-smoke-last.json
 buildscripts/*.pyc
 site_scons/*.pyc
 site_scons/site_tools/*.pyc
diff --git a/debian/control b/debian/control
index fc562aa..fcc8301 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Build-Depends:
  libssl1.0-dev,
  zlib1g-dev,
  python-pymongo,
+ python-subprocess32,
+ python-yaml,
  python,
  scons,
  tzdata,
diff --git a/debian/rules b/debian/rules
index cf813b8..53d7f39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,15 +47,14 @@ override_dh_auto_clean:
 	rm -rf $(CURDIR)/debian/tmp-test/
 	rm -rf $(CURDIR)/.scons/
 	rm -rf $(CURDIR)/build/
-	rm -f $(CURDIR)/failfile.smoke $(CURDIR)/smoke-last.json
 
 override_dh_auto_build:
 	scons $(COMMON_OPTIONS) core tools
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	scons $(COMMON_OPTIONS) dbtest unittests integration_tests
-	python ./buildscripts/smoke.py --smoke-db-prefix="$(CURDIR)/debian/tmp-test"
+	scons $(COMMON_OPTIONS) dbtest unittests
+	python ./buildscripts/resmoke.py --dbpathPrefix="$(CURDIR)/debian/tmp-test" --suites=dbtest,unittests
 .PHONY: override_dh_auto_test
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git