about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-12-06 13:01:02 -0800
committerEric Wong <normalperson@yhbt.net>2011-12-06 13:01:02 -0800
commit652398d0def7291ea7a4e54c3e418d88038ed436 (patch)
treef6f94af235ccb55eb29c98305edd2267ff219fd1
parent829d459f7335cb6eb6a2f6d24e0d6f984cef2d52 (diff)
downloadmogilefs-client-652398d0def7291ea7a4e54c3e418d88038ed436.tar.gz
We need to test with this client, dependencies are hard :<
-rw-r--r--Manifest.txt2
-rw-r--r--test/test_mogstored_rack.rb9
2 files changed, 8 insertions, 3 deletions
diff --git a/Manifest.txt b/Manifest.txt
index a5cbb84..3c70095 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -11,7 +11,6 @@ README
 Rakefile
 TODO
 bin/mog
-examples/mogstored_rack.rb
 lib/mogilefs.rb
 lib/mogilefs/admin.rb
 lib/mogilefs/backend.rb
@@ -56,5 +55,4 @@ test/test_mogstored_rack.rb
 test/test_mogtool_bigfile.rb
 test/test_mysql.rb
 test/test_pool.rb
-test/test_unit_mogstored_rack.rb
 lib/mogilefs/version.rb
diff --git a/test/test_mogstored_rack.rb b/test/test_mogstored_rack.rb
index f4bb0ca..e3fb889 100644
--- a/test/test_mogstored_rack.rb
+++ b/test/test_mogstored_rack.rb
@@ -1,5 +1,12 @@
 # -*- encoding: binary -*-
 require "./test/fresh"
+begin
+  require 'mogstored_rack'
+  require 'unicorn'
+  ok = true
+rescue LoadError
+  ok = false
+end
 
 class TestMogstoredRack < Test::Unit::TestCase
   include TestFreshSetup
@@ -83,4 +90,4 @@ EOF
     teardown_mogilefs
     puts(@unicorn_stderr.read) if $DEBUG
   end
-end if `which unicorn`.chomp.size > 0
+end if ok && `which unicorn`.chomp.size > 0