1. devstack
  2. Commit dd363a182fb1f8472bc163c82ea5f48e8f8fd29e
Browse code

Cleanup test_ip.sh to give more consistent output

Minor changes to give more consistent output; no functional changes to
tests.

Change-Id: I6c4ef74587c59b786761735c7bd528f3d7f94905

Ian Wienand authored on 2015/05/25 10:50:32
Showing 1 changed files
tests/test_ip.sh
History View file @ dd363a1
... ... 
@@ -48,60 +48,44 @@ function test_cidr2netmask {
48 48
49 49 
 test_cidr2netmask
50 50
51 
-if [[ $(maskip 169.254.169.254 240.0.0.0) == 160.0.0.0 ]]; then
52 
-    passed "maskip(): /4...OK"
53 
-else
54 
-    failed "maskip(): /4...failed"
55 
-fi
56 
-if [[ $(maskip 169.254.169.254 255.0.0.0) == 169.0.0.0 ]]; then
57 
-    passed "maskip(): /8...OK"
58 
-else
59 
-    failed "maskip(): /8...failed"
60 
-fi
61 
-if [[ $(maskip 169.254.169.254 255.240.0.0) == 169.240.0.0 ]]; then
62 
-    passed "maskip(): /12...OK"
63 
-else
64 
-    failed "maskip(): /12...failed"
65 
-fi
66 
-if [[ $(maskip 169.254.169.254 255.255.0.0) == 169.254.0.0 ]]; then
67 
-    passed "maskip(): /16...OK"
68 
-else
69 
-    failed "maskip(): /16...failed"
70 
-fi
71 
-if [[ $(maskip 169.254.169.254 255.255.240.0) == 169.254.160.0 ]]; then
72 
-    passed "maskip(): /20...OK"
73 
-else
74 
-    failed "maskip(): /20...failed"
75 
-fi
76 
-if [[ $(maskip 169.254.169.254 255.255.255.0) == 169.254.169.0 ]]; then
77 
-    passed "maskip(): /24...OK"
78 
-else
79 
-    failed "maskip(): /24...failed"
80 
-fi
81 
-if [[ $(maskip 169.254.169.254 255.255.255.240) == 169.254.169.240 ]]; then
82 
-    passed "maskip(): /28...OK"
83 
-else
84 
-    failed "maskip(): /28...failed"
85 
-fi
86 
-if [[ $(maskip 169.254.169.254 255.255.255.255) == 169.254.169.254 ]]; then
87 
-    passed "maskip(): /32...OK"
88 
-else
89 
-    failed "maskip(): /32...failed"
90 
-fi
51 
+msg="maskip(169.254.169.254 240.0.0.0) == 160.0.0.0"
52 
+assert_equal $(maskip 169.254.169.254 240.0.0.0) 160.0.0.0 "$msg"
53 
+
54 
+msg="maskip(169.254.169.254 255.0.0.0) == 169.0.0.0"
55 
+assert_equal $(maskip 169.254.169.254 255.0.0.0) 169.0.0.0 "$msg"
56 
+
57 
+msg="maskip(169.254.169.254 255.240.0.0) == 169.240.0.0"
58 
+assert_equal $(maskip 169.254.169.254 255.240.0.0) 169.240.0.0 "$msg"
59 
+
60 
+msg="maskip(169.254.169.254 255.255.0.0) == 169.254.0.0"
61 
+assert_equal $(maskip 169.254.169.254 255.255.0.0) 169.254.0.0 "$msg"
62 
+
63 
+msg="maskip(169.254.169.254 255.255.240.0) == 169.254.160.0"
64 
+assert_equal $(maskip 169.254.169.254 255.255.240.0) 169.254.160.0 "$msg"
65 
+
66 
+msg="maskip(169.254.169.254 255.255.255.0) == 169.254.169.0"
67 
+assert_equal $(maskip 169.254.169.254 255.255.255.0) 169.254.169.0 "$msg"
68 
+
69 
+msg="maskip(169.254.169.254 255.255.255.240) == 169.254.169.240"
70 
+assert_equal $(maskip 169.254.169.254 255.255.255.240) 169.254.169.240 "$msg"
71 
+
72 
+msg="maskip(169.254.169.254 255.255.255.255) == 169.254.169.254"
73 
+assert_equal $(maskip 169.254.169.254 255.255.255.255) 169.254.169.254 "$msg"
74 
+
91 75
92 76 
 for mask in 8 12 16 20 24 26 28; do
93 
-    echo -n "address_in_net(): in /$mask..."
77 
+    msg="address_in_net($10.10.10.1 10.10.10.0/$mask)"
94 78 
     if address_in_net 10.10.10.1 10.10.10.0/$mask; then
95 
-        passed "OK"
79 
+        passed "$msg"
96 80 
     else
97 
-        failed "address_in_net() failed on /$mask"
81 
+        failed "$msg"
98 82 
     fi
99 83
100 
-    echo -n "address_in_net(): not in /$mask..."
84 
+    msg="! address_in_net($10.10.10.1 11.11.11.0/$mask)"
101 85 
     if ! address_in_net 10.10.10.1 11.11.11.0/$mask; then
102 
-        passed "OK"
86 
+        passed "$msg"
103 87 
     else
104 
-        failed "address_in_net() failed on /$mask"
88 
+        failed "$msg"
105 89 
     fi
106 90 
 done
107 91