diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2012-06-26 16:07:48 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2012-06-26 16:07:48 +0200 |
| commit | 9001f48f45a368efe079c3dea84b174196de4581 (patch) | |
| tree | d55ba27ebebbe3174d742c58f58b07a9f527aa4d | |
| parent | d1080a6888ad6fcc3dfe23a7fd910030fdcf0c94 (diff) | |
fix variable mixup
| -rw-r--r-- | test/toxbank-investigation-curl.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/toxbank-investigation-curl.rb b/test/toxbank-investigation-curl.rb index 2810103..e06f2d6 100644 --- a/test/toxbank-investigation-curl.rb +++ b/test/toxbank-investigation-curl.rb @@ -28,8 +28,8 @@ class UploadTest < Test::Unit::TestCase file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", f response = `curl -Lk -X POST -i -F file="@#{file};type=application/zip" -H "subjectid:#{@@subjectid}" #{$toxbank_investigation[:uri]}`.chomp assert_match /202/, response - uri = response.split("\n")[-1] - t = OpenTox::Task.new(uri) + taskuri = response.split("\n")[-1] + t = OpenTox::Task.new(taskuri) t.wait assert_equal true, t.completed? assert_match t.hasStatus, "Completed" @@ -43,10 +43,10 @@ class UploadTest < Test::Unit::TestCase files.each{|f| assert_equal true, File.exists?(File.join(File.expand_path(@tmpdir),f)) } # get isatab files urilist = `curl -Lk -H "subjectid:#{@@subjectid}" -H "Accept:text/uri-list" #{$toxbank_investigation[:uri]}`.split("\n") - urilist.each do |uri| - unless uri.match(/[n3|zip]$/) - response = `curl -Lk -i -H "Accept:text/tab-separated-values" -H "subjectid:#{@@subjectid}" #{uri}` - assert_match /HTTP\/1.1 200 OK/, response.to_s.encode!('UTF-8', 'UTF-8', :invalid => :replace) + urilist.each do |u| + unless u.match(/[n3|zip]$/) + response = `curl -Lk -i -H "Accept:text/tab-separated-values" -H "subjectid:#{@@subjectid}" #{u}` + assert_match /HTTP\/1.1 200 OK/, response.to_s.encode!('UTF-8', 'UTF-8', :invalid => :replace) end end # delete |