summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2012-05-07 17:27:25 +0200
committergebele <gebele@in-silico.ch>2012-05-07 17:27:25 +0200
commit81346e1ba9624b57e476688167157e64e07c60fd (patch)
tree0e0694339318892daf736178e9394e1a0473927e
parent22fa8d86e8975458e887ca176097bfe7c4f5a28c (diff)
removed isa-tab-renamed.zip
-rw-r--r--test/data/toxbank-investigation/valid/isa-tab-renamed.zipbin15666 -> 0 bytes
-rw-r--r--test/toxbank-investigation-curl.rb7
2 files changed, 3 insertions, 4 deletions
diff --git a/test/data/toxbank-investigation/valid/isa-tab-renamed.zip b/test/data/toxbank-investigation/valid/isa-tab-renamed.zip
deleted file mode 100644
index b8130a8..0000000
--- a/test/data/toxbank-investigation/valid/isa-tab-renamed.zip
+++ /dev/null
Binary files differ
diff --git a/test/toxbank-investigation-curl.rb b/test/toxbank-investigation-curl.rb
index f228bb4..2810103 100644
--- a/test/toxbank-investigation-curl.rb
+++ b/test/toxbank-investigation-curl.rb
@@ -24,8 +24,7 @@ class UploadTest < Test::Unit::TestCase
def test_03_valid_zip_upload
# upload
- #["E-MTAB-798_philippe.zip"].each do |f|
- ["BII-I-1.zip","isa-tab-renamed.zip","E-MTAB-798_philippe.zip"].each do |f|
+ ["BII-I-1.zip","E-MTAB-798_philippe.zip"].each do |f|
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
@@ -73,7 +72,7 @@ class UploadTest < Test::Unit::TestCase
=begin
def test_rest_client_wrapper
- ["BII-I-1.zip","isa-tab-renamed.zip"].each do |f|
+ ["BII-I-1.zip"].each do |f|
file = File.join File.dirname(__FILE__), "toxbank-investigation","data/toxbank-investigation/valid", f
investigation_uri = OpenTox::RestClientWrapper.post $toxbank_investigation[:uri], {:file => File.read(file),:name => file}, {:content_type => "application/zip", :subjectid => @@subjectid}
puts investigation_uri
@@ -103,7 +102,7 @@ class UploadTest < Test::Unit::TestCase
=begin
def test_ruby_api
- ["BII-I-1.zip","isa-tab-renamed.zip"].each do |f|
+ ["BII-I-1.zip"].each do |f|
file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", f
investigation = OpenTox::Investigation.create $toxbank_investigation[:uri], :file => file, :headers => {:content_type => "application/zip", :subjectid => @@subjectid}
zip = File.join @tmpdir,"tmp.zip"