Changeset: 5d432332635f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d432332635f
Modified Files:
clients/R/Tests/dbi.stable.err
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/install.R
Branch: default
Log Message:
r tests using mfilter variable output now
diffs (85 lines):
diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err
--- a/clients/R/Tests/dbi.stable.err
+++ b/clients/R/Tests/dbi.stable.err
@@ -37,6 +37,7 @@ Use 'dbIsValid' instead.
See help("Deprecated")
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
+Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Treating character vector parameter as file name(s) for monetdb.read.csv()
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,8 +1,15 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
-dd <- capture.output(suppressMessages(suppressWarnings({
- repos <- "http://cran.rstudio.com/";
- lp <- c("devtools", "digest")
- install.packages(lp, repos=repos, quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp)
- devtools::install_github("rstats-db/DBI", quiet=T)
-})))
+
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+repos <- "http://cran.rstudio.com/";
+packages_required <- c("devtools", "digest")
+install.packages(packages_required, repos=repos, quiet=T)
+update.packages(repos=repos, ask=F, oldPkgs=packages_required)
+devtools::install_github("rstats-db/DBI", quiet=T)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n\n", file=stdout())
+
+stopifnot(all(c(packages_required, "DBI") %in%
installed.packages()[,"Package"]))
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,8 +1,21 @@
-dd <- capture.output(suppressMessages(suppressWarnings({
- (function(lp) {
+packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13')
+
+install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- 'http://cran.rstudio.com/'
if(length(np)) install.packages(np, repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- })(c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata'))
-})))
+}
+
+
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+
+install_or_upgrade_packages(packages_required)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n", file=stdout())
+
+stopifnot(all(packages_required %in% installed.packages()[,"Package"]))
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -1,4 +1,11 @@
-dd <- capture.output(suppressMessages( {
- devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
-}))
-library(MonetDBLite,quietly=T)
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n", file=stdout())
+
+stopifnot("MonetDBLite" %in% installed.packages()[,"Package"])
+
+library(MonetDBLite, quietly=T)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
