Browse Source

[2252] adjust lettuce tests; xfrin_notify_handling.feature

The defect #2879 has been fixed (merged into the master branch). So
cares for that would be no more needed if this branch is merged. The
counters are adjusted to correct and the notes are removed.
Naoki Kambe 12 years ago
parent
commit
0a2277b4be
1 changed files with 32 additions and 52 deletions
  1. 32 52
      tests/lettuce/features/xfrin_notify_handling.feature

+ 32 - 52
tests/lettuce/features/xfrin_notify_handling.feature

@@ -84,20 +84,15 @@ Feature: Xfrin incoming notify handling
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
     The statistics counters are 0 in category .Xfrin.zones except for the following items
-      | item_name                       | item_value | min_value | max_value |
-      | _SERVER_.soaoutv6               |            |           |         3 |
-      | _SERVER_.axfrreqv6              |            |           |         3 |
-      | _SERVER_.xfrsuccess             |          1 |           |           |
-      | _SERVER_.last_axfr_duration     |            |       0.0 |           |
-      | example.org..soaoutv6           |            |           |         3 |
-      | example.org..axfrreqv6          |            |           |         3 |
-      | example.org..xfrsuccess         |          1 |           |           |
-      | example.org..last_axfr_duration |            |       0.0 |           |
-    # Note: Originally the above soaoutv6 and axfrreqv6 should be
-    # expected to be 1. But due to a bug on notify_out.py, the result
-    # is sometimes increased up to 2 or more. So 3 is set to a maximum
-    # number so far. If the bug is fixed, please change it to a exact
-    # number (1). Please see #2879 for details about the bug.
+      | item_name                       | item_value | min_value |
+      | _SERVER_.soaoutv6               |          1 |           |
+      | _SERVER_.axfrreqv6              |          1 |           |
+      | _SERVER_.xfrsuccess             |          1 |           |
+      | _SERVER_.last_axfr_duration     |            |       0.0 |
+      | example.org..soaoutv6           |          1 |           |
+      | example.org..axfrreqv6          |          1 |           |
+      | example.org..xfrsuccess         |          1 |           |
+      | example.org..last_axfr_duration |            |       0.0 |
 
     #
     # Test for handling incoming notify only in IPv4
@@ -187,20 +182,15 @@ Feature: Xfrin incoming notify handling
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
     The statistics counters are 0 in category .Xfrin.zones except for the following items
-      | item_name                       | item_value | min_value | max_value |
-      | _SERVER_.soaoutv4               |            |           |         3 |
-      | _SERVER_.axfrreqv4              |            |           |         3 |
-      | _SERVER_.xfrsuccess             |          1 |           |           |
-      | _SERVER_.last_axfr_duration     |            |       0.0 |           |
-      | example.org..soaoutv4           |            |           |         3 |
-      | example.org..axfrreqv4          |            |           |         3 |
-      | example.org..xfrsuccess         |          1 |           |           |
-      | example.org..last_axfr_duration |            |       0.0 |           |
-    # Note: Originally the above soaoutv4 and axfrreqv4 should be
-    # expected to be 1. But due to a bug on notify_out.py, the result
-    # is sometimes increased up to 2 or more. So 3 is set to a maximum
-    # number so far. If the bug is fixed, please change it to a exact
-    # number (1). Please see #2879 for details about the bug.
+      | item_name                       | item_value | min_value |
+      | _SERVER_.soaoutv4               |          1 |           |
+      | _SERVER_.axfrreqv4              |          1 |           |
+      | _SERVER_.xfrsuccess             |          1 |           |
+      | _SERVER_.last_axfr_duration     |            |       0.0 |
+      | example.org..soaoutv4           |          1 |           |
+      | example.org..axfrreqv4          |          1 |           |
+      | example.org..xfrsuccess         |          1 |           |
+      | example.org..last_axfr_duration |            |       0.0 |
 
     #
     # Test for Xfr request rejected
@@ -297,18 +287,13 @@ Feature: Xfrin incoming notify handling
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
     The statistics counters are 0 in category .Xfrin.zones except for the following items
-      | item_name              | min_value | max_value |
-      | _SERVER_.soaoutv6      |         1 |         3 |
-      | _SERVER_.axfrreqv6     |         1 |         3 |
-      | _SERVER_.xfrfail       |         1 |         3 |
-      | example.org..soaoutv6  |         1 |         3 |
-      | example.org..axfrreqv6 |         1 |         3 |
-      | example.org..xfrfail   |         1 |         3 |
-    # Note: Originally the above counters should be expected to be
-    # 1. But due to a bug on notify_out.py, the result is sometimes
-    # increased up to 2 or more. So 3 is set to a maximum number so
-    # far. If the bug is fixed, please change it to a exact number
-    # (1). Please see #2879 for details about the bug.
+      | item_name              | item_value |
+      | _SERVER_.soaoutv6      |          1 |
+      | _SERVER_.axfrreqv6     |          1 |
+      | _SERVER_.xfrfail       |          1 |
+      | example.org..soaoutv6  |          1 |
+      | example.org..axfrreqv6 |          1 |
+      | example.org..xfrfail   |          1 |
 
     #
     # Test for Xfr request rejected in IPv4
@@ -405,18 +390,13 @@ Feature: Xfrin incoming notify handling
 
     When I query statistics zones of bind10 module Xfrin with cmdctl
     The statistics counters are 0 in category .Xfrin.zones except for the following items
-      | item_name              | min_value | max_value |
-      | _SERVER_.soaoutv4      |         1 |         3 |
-      | _SERVER_.axfrreqv4     |         1 |         3 |
-      | _SERVER_.xfrfail       |         1 |         3 |
-      | example.org..soaoutv4  |         1 |         3 |
-      | example.org..axfrreqv4 |         1 |         3 |
-      | example.org..xfrfail   |         1 |         3 |
-    # Note: Originally the above counters should be expected to be
-    # 1. But due to a bug on notify_out.py, the result is sometimes
-    # increased up to 2 or more. So 3 is set to a maximum number so
-    # far. If the bug is fixed, please change it to a exact number
-    # (1). Please see #2879 for details about the bug.
+      | item_name              | item_value |
+      | _SERVER_.soaoutv4      |          1 |
+      | _SERVER_.axfrreqv4     |          1 |
+      | _SERVER_.xfrfail       |          1 |
+      | example.org..soaoutv4  |          1 |
+      | example.org..axfrreqv4 |          1 |
+      | example.org..xfrfail   |          1 |
 
     #
     # Test for unreachable slave