Raise RuntimeError when API is incorrectly used

ezmobius · Aug 19, 2011 · 8097994 · 8097994
1 parent 99569d1
commit 8097994
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/redis.rb b/lib/redis.rb
@@ -1086,15 +1086,15 @@ def subscribed?
   # Stop listening for messages posted to the given channels.
   def unsubscribe(*channels)
     synchronize do
-      raise Error, "Can't unsubscribe if not subscribed." unless subscribed?
+      raise RuntimeError, "Can't unsubscribe if not subscribed." unless subscribed?
       @client.unsubscribe(*channels)
     end
   end
 
   # Stop listening for messages posted to channels matching the given patterns.
   def punsubscribe(*channels)
     synchronize do
-      raise Error, "Can't unsubscribe if not subscribed." unless subscribed?
+      raise RuntimeError, "Can't unsubscribe if not subscribed." unless subscribed?
       @client.punsubscribe(*channels)
     end
   end

diff --git a/lib/redis/distributed.rb b/lib/redis/distributed.rb
@@ -599,7 +599,7 @@ def subscribed?
 
     # Stop listening for messages posted to the given channels.
     def unsubscribe(*channels)
-      raise Error, "Can't unsubscribe if not subscribed." unless subscribed?
+      raise RuntimeError, "Can't unsubscribe if not subscribed." unless subscribed?
       @subscribed_node.unsubscribe(*channels)
     end
 

diff --git a/test/publish_subscribe_test.rb b/test/publish_subscribe_test.rb
@@ -128,11 +128,11 @@
 end
 
 test "UNSUBSCRIBE without a SUBSCRIBE" do |r|
-  assert_raise Redis::Error do
+  assert_raise RuntimeError do
     r.unsubscribe
   end
 
-  assert_raise Redis::Error do
+  assert_raise RuntimeError do
     r.punsubscribe
   end
 end