[med-svn] [r-cran-rsqlite] 05/06: Adapt test suite to new upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-rsqlite.

commit 51acdacfaa9c48e294e6c9164d4590eead507198
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jun 27 12:08:10 2015 +0200

    Adapt test suite to new upstream version
---
 debian/changelog                                        |  1 +
 .../do_not_check_against_bundled_sqlite_version.patch   | 17 -----------------
 debian/patches/series                                   |  1 -
 debian/tests/control                                    |  2 +-
 debian/tests/run-unit-test                              | 14 +++-----------
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1d3418..f7533e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ r-cran-rsqlite (1.0.0-1) UNRELEASED; urgency=medium
 
   * New upstream version
   * cme fix dpkg-control
+  * Adapt test patches
 
  -- Andreas Tille <tille at debian.org>  Sat, 27 Jun 2015 11:51:37 +0200
 
diff --git a/debian/patches/do_not_check_against_bundled_sqlite_version.patch b/debian/patches/do_not_check_against_bundled_sqlite_version.patch
deleted file mode 100644
index 7617af5..0000000
--- a/debian/patches/do_not_check_against_bundled_sqlite_version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Sat, 21 Jun 2014 08:09:49 +0200
-Description: The package is not build against the included sqlite
- version but rather against the Debian packaged version.  So it makes
- no sense to check the included version number
-
---- a/inst/UnitTests/dbGetInfo_test.R
-+++ b/inst/UnitTests/dbGetInfo_test.R
-@@ -6,7 +6,7 @@ test_dbGetInfo_connection <- function()
-     info <- dbGetInfo(db)
-     checkEquals(6L, length(info))
-     checkEquals(":memory:", info[["dbname"]])
--    checkEquals("3.7.17", info[["serverVersion"]])
-+    # checkEquals("3.7.17", info[["serverVersion"]])
-     checkEquals(integer(0), info[["rsId"]])
-     checkEquals("on", info[["loadableExtensions"]])
-     checkEquals(SQLITE_RWC, info[["flags"]])
diff --git a/debian/patches/series b/debian/patches/series
index ce9dd16..fd2687e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-do_not_check_against_bundled_sqlite_version.patch
 #needs further investigation# skip_warning_about_version_mismatch.patch
diff --git a/debian/tests/control b/debian/tests/control
index 25377fc..b044b0c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, r-cran-runit
+Depends: @, r-cran-testthat
 Restrictions: allow-stderr
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 0921c06..17b808b 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -6,14 +6,6 @@ if [ "$ADTTMP" = "" ] ; then
 fi
 cd $ADTTMP
 cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
-find . -name "*.gz" -exec gunzip \{\} \;
-for runtest in `ls *.R` ; do
-   R --no-save < $runtest >/dev/null
-   if [ ! $? ] ; then
-     echo "Test ${htest} failed"
-     exit 1
-   else
-     echo "Test ${htest} passed"
-   fi
-done
-rm -f $ADTTMP/*
+gunzip -r *
+LC_ALL=C R --no-save < testthat.R
+rm -fr $ADTTMP/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-rsqlite.git