diff options
author | rautenberg <rautenberg@in-silico.ch> | 2012-03-13 15:45:20 +0100 |
---|---|---|
committer | rautenberg <rautenberg@in-silico.ch> | 2012-03-13 15:45:20 +0100 |
commit | dca402165ec3dadfed35f261acd44c7a260ef00e (patch) | |
tree | 00fcd0d42a3ad076a8eecc1dd862c7d983ebef72 | |
parent | f1d19b87f327cb8549d413b669c5032f71ebe385 (diff) | |
parent | c5eb2319eaedfb289d02efea43019008500e7511 (diff) |
Merge branch 'release/v3.1.0' into development
-rw-r--r-- | r-util.rb | 2 | ||||
-rw-r--r-- | validation.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -25,7 +25,6 @@ class RUtilTest < Test::Unit::TestCase end def global_teardown - OpenTox::Authorization.logout(@@subjectid) if defined?(@@signout) @@rutil.quit_r if DELETE @@resources.each do |uri| @@ -34,6 +33,7 @@ class RUtilTest < Test::Unit::TestCase else puts "Resources "+@@resources.to_yaml end + OpenTox::Authorization.logout(@@subjectid) if defined?(@@signout) end def pre_files(files) diff --git a/validation.rb b/validation.rb index 919a562..159bf8e 100644 --- a/validation.rb +++ b/validation.rb @@ -69,7 +69,7 @@ class ValidationTest < Test::Unit::TestCase if @@delete [:data, :train_data, :test_data].each do |d| @@data.each do |data| - OpenTox::Dataset.find(data[d],@@subjectid).delete(@@subjectid) if data[d] and data[:delete] and OpenTox::Dataset.exist?(data[d]) + OpenTox::Dataset.find(data[d],@@subjectid).delete(@@subjectid) if data[d] and data[:delete] and OpenTox::Dataset.exist?(data[d], @@subjectid) end end @@vs.each{|v| v.delete(@@subjectid)} if defined?@@vs |