From 1bc41b55faf0553eda4044a707c92f19a6fb465d Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 21 Feb 2012 10:05:54 +0100 Subject: delete subjectid after usage. --- r-util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r-util.rb b/r-util.rb index 8ff5b80..77f68fa 100644 --- a/r-util.rb +++ b/r-util.rb @@ -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) -- cgit v1.2.3 From c5eb2319eaedfb289d02efea43019008500e7511 Mon Sep 17 00:00:00 2001 From: rautenberg Date: Tue, 13 Mar 2012 10:38:07 +0100 Subject: add missing subjectid --- validation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3