Copyright date fixed in COPYING file.

[redis.git] / tests / unit / basic.tcl

diff --git a/tests/unit/basic.tcl b/tests/unit/basic.tcl
index fec782ef18ba1bed68156966231b285cc51695e2..86498d1fa53905516e60f1c3115c85b4efd5ccfe 100644 (file)
--- a/tests/unit/basic.tcl
+++ b/tests/unit/basic.tcl
@@ -143,7 +143,7 @@ start_server {tags {"basic"}} {
         catch {r incr mylist} err
         r rpop mylist
         format $err
         catch {r incr mylist} err
         r rpop mylist
         format $err

-    } {ERR*}
+    } {WRONGTYPE*}

 
     test {DECRBY over 32bit value with over 32bit increment, negative res} {
         r set novar 17179869184
 
     test {DECRBY over 32bit value with over 32bit increment, negative res} {
         r set novar 17179869184


@@ -152,13 +152,15 @@ start_server {tags {"basic"}} {
 
     test {INCRBYFLOAT against non existing key} {
         r del novar
 
     test {INCRBYFLOAT against non existing key} {
         r del novar

-        list [r incrbyfloat novar 1] [r get novar] [r incrbyfloat novar 0.25] \
-             [r get novar]
+        list    [roundFloat [r incrbyfloat novar 1]] \
+                [roundFloat [r get novar]] \
+                [roundFloat [r incrbyfloat novar 0.25]] \
+                [roundFloat [r get novar]]

     } {1 1 1.25 1.25}
 
     test {INCRBYFLOAT against key originally set with SET} {
         r set novar 1.5
     } {1 1 1.25 1.25}
 
     test {INCRBYFLOAT against key originally set with SET} {
         r set novar 1.5

-        r incrbyfloat novar 1.5
+        roundFloat [r incrbyfloat novar 1.5]

     } {3}
 
     test {INCRBYFLOAT over 32bit value} {
     } {3}
 
     test {INCRBYFLOAT over 32bit value} {


@@ -199,7 +201,7 @@ start_server {tags {"basic"}} {
         catch {r incrbyfloat mylist 1.0} err
         r del mylist
         format $err
         catch {r incrbyfloat mylist 1.0} err
         r del mylist
         format $err

-    } {ERR*kind*}
+    } {WRONGTYPE*}

 
     test {INCRBYFLOAT does not allow NaN or Infinity} {
         r set foo 0
 
     test {INCRBYFLOAT does not allow NaN or Infinity} {
         r set foo 0


@@ -213,7 +215,7 @@ start_server {tags {"basic"}} {
 
     test {INCRBYFLOAT decrement} {
         r set foo 1
 
     test {INCRBYFLOAT decrement} {
         r set foo 1

-        r incrbyfloat foo -1.1
+        roundFloat [r incrbyfloat foo -1.1]

     } {-0.1}
 
     test "SETNX target key missing" {
     } {-0.1}
 
     test "SETNX target key missing" {


@@ -529,7 +531,7 @@ start_server {tags {"basic"}} {
     test "SETBIT against key with wrong type" {
         r del mykey
         r lpush mykey "foo"
     test "SETBIT against key with wrong type" {
         r del mykey
         r lpush mykey "foo"

-        assert_error "*wrong kind*" {r setbit mykey 0 1}
+        assert_error "WRONGTYPE*" {r setbit mykey 0 1}

     }
 
     test "SETBIT with out of range bit offset" {
     }
 
     test "SETBIT with out of range bit offset" {


@@ -663,7 +665,7 @@ start_server {tags {"basic"}} {
     test "SETRANGE against key with wrong type" {
         r del mykey
         r lpush mykey "foo"
     test "SETRANGE against key with wrong type" {
         r del mykey
         r lpush mykey "foo"

-        assert_error "*wrong kind*" {r setrange mykey 0 bar}
+        assert_error "WRONGTYPE*" {r setrange mykey 0 bar}

     }
 
     test "SETRANGE with out of range offset" {
     }
 
     test "SETRANGE with out of range offset" {