1. devstack
  2. Commit f56348bcb2c736b9e66ebfe20c1f118cfc96b9f6
Browse code

Use unittest help in test_ip.sh

Use the unittest helper to track test runs and correctly exit with a
failure code if there is a problem

Change-Id: Ie62f354a8cd3b8fd5986e6943a073f7955fb55ba

Ian Wienand authored on 2015/04/17 11:58:56
Showing 1 changed files
tests/test_ip.sh
History View file @ f56348b
... ... 
@@ -8,108 +8,111 @@ TOP=$(cd $(dirname "$0")/.. && pwd)
8 8 
 # Import common functions
9 9 
 source $TOP/functions
10 10
11 
+source $TOP/tests/unittest.sh
11 12
12 13 
 echo "Testing IP addr functions"
13 14
14 15 
 if [[ $(cidr2netmask 4) == 240.0.0.0 ]]; then
15 
-    echo "cidr2netmask(): /4...OK"
16 
+    passed "cidr2netmask(): /4...OK"
16 17 
 else
17 
-    echo "cidr2netmask(): /4...failed"
18 
+    failed "cidr2netmask(): /4...failed"
18 19 
 fi
19 20 
 if [[ $(cidr2netmask 8) == 255.0.0.0 ]]; then
20 
-    echo "cidr2netmask(): /8...OK"
21 
+    passed "cidr2netmask(): /8...OK"
21 22 
 else
22 
-    echo "cidr2netmask(): /8...failed"
23 
+    failed "cidr2netmask(): /8...failed"
23 24 
 fi
24 25 
 if [[ $(cidr2netmask 12) == 255.240.0.0 ]]; then
25 
-    echo "cidr2netmask(): /12...OK"
26 
+    passed "cidr2netmask(): /12...OK"
26 27 
 else
27 
-    echo "cidr2netmask(): /12...failed"
28 
+    failed "cidr2netmask(): /12...failed"
28 29 
 fi
29 30 
 if [[ $(cidr2netmask 16) == 255.255.0.0 ]]; then
30 
-    echo "cidr2netmask(): /16...OK"
31 
+    passed "cidr2netmask(): /16...OK"
31 32 
 else
32 
-    echo "cidr2netmask(): /16...failed"
33 
+    failed "cidr2netmask(): /16...failed"
33 34 
 fi
34 35 
 if [[ $(cidr2netmask 20) == 255.255.240.0 ]]; then
35 
-    echo "cidr2netmask(): /20...OK"
36 
+    passed "cidr2netmask(): /20...OK"
36 37 
 else
37 
-    echo "cidr2netmask(): /20...failed"
38 
+    failed "cidr2netmask(): /20...failed"
38 39 
 fi
39 40 
 if [[ $(cidr2netmask 24) == 255.255.255.0 ]]; then
40 
-    echo "cidr2netmask(): /24...OK"
41 
+    passed "cidr2netmask(): /24...OK"
41 42 
 else
42 
-    echo "cidr2netmask(): /24...failed"
43 
+    failed "cidr2netmask(): /24...failed"
43 44 
 fi
44 45 
 if [[ $(cidr2netmask 28) == 255.255.255.240 ]]; then
45 
-    echo "cidr2netmask(): /28...OK"
46 
+    passed "cidr2netmask(): /28...OK"
46 47 
 else
47 
-    echo "cidr2netmask(): /28...failed"
48 
+    failed "cidr2netmask(): /28...failed"
48 49 
 fi
49 50 
 if [[ $(cidr2netmask 30) == 255.255.255.252 ]]; then
50 
-    echo "cidr2netmask(): /30...OK"
51 
+    passed "cidr2netmask(): /30...OK"
51 52 
 else
52 
-    echo "cidr2netmask(): /30...failed"
53 
+    failed "cidr2netmask(): /30...failed"
53 54 
 fi
54 55 
 if [[ $(cidr2netmask 32) == 255.255.255.255 ]]; then
55 
-    echo "cidr2netmask(): /32...OK"
56 
+    passed "cidr2netmask(): /32...OK"
56 57 
 else
57 
-    echo "cidr2netmask(): /32...failed"
58 
+    failed "cidr2netmask(): /32...failed"
58 59 
 fi
59 60
60 61 
 if [[ $(maskip 169.254.169.254 240.0.0.0) == 160.0.0.0 ]]; then
61 
-    echo "maskip(): /4...OK"
62 
+    passed "maskip(): /4...OK"
62 63 
 else
63 
-    echo "maskip(): /4...failed"
64 
+    failed "maskip(): /4...failed"
64 65 
 fi
65 66 
 if [[ $(maskip 169.254.169.254 255.0.0.0) == 169.0.0.0 ]]; then
66 
-    echo "maskip(): /8...OK"
67 
+    passed "maskip(): /8...OK"
67 68 
 else
68 
-    echo "maskip(): /8...failed"
69 
+    failed "maskip(): /8...failed"
69 70 
 fi
70 71 
 if [[ $(maskip 169.254.169.254 255.240.0.0) == 169.240.0.0 ]]; then
71 
-    echo "maskip(): /12...OK"
72 
+    passed "maskip(): /12...OK"
72 73 
 else
73 
-    echo "maskip(): /12...failed"
74 
+    failed "maskip(): /12...failed"
74 75 
 fi
75 76 
 if [[ $(maskip 169.254.169.254 255.255.0.0) == 169.254.0.0 ]]; then
76 
-    echo "maskip(): /16...OK"
77 
+    passed "maskip(): /16...OK"
77 78 
 else
78 
-    echo "maskip(): /16...failed"
79 
+    failed "maskip(): /16...failed"
79 80 
 fi
80 81 
 if [[ $(maskip 169.254.169.254 255.255.240.0) == 169.254.160.0 ]]; then
81 
-    echo "maskip(): /20...OK"
82 
+    passed "maskip(): /20...OK"
82 83 
 else
83 
-    echo "maskip(): /20...failed"
84 
+    failed "maskip(): /20...failed"
84 85 
 fi
85 86 
 if [[ $(maskip 169.254.169.254 255.255.255.0) == 169.254.169.0 ]]; then
86 
-    echo "maskip(): /24...OK"
87 
+    passed "maskip(): /24...OK"
87 88 
 else
88 
-    echo "maskip(): /24...failed"
89 
+    failed "maskip(): /24...failed"
89 90 
 fi
90 91 
 if [[ $(maskip 169.254.169.254 255.255.255.240) == 169.254.169.240 ]]; then
91 
-    echo "maskip(): /28...OK"
92 
+    passed "maskip(): /28...OK"
92 93 
 else
93 
-    echo "maskip(): /28...failed"
94 
+    failed "maskip(): /28...failed"
94 95 
 fi
95 96 
 if [[ $(maskip 169.254.169.254 255.255.255.255) == 169.254.169.254 ]]; then
96 
-    echo "maskip(): /32...OK"
97 
+    passed "maskip(): /32...OK"
97 98 
 else
98 
-    echo "maskip(): /32...failed"
99 
+    failed "maskip(): /32...failed"
99 100 
 fi
100 101
101 102 
 for mask in 8 12 16 20 24 26 28; do
102 103 
     echo -n "address_in_net(): in /$mask..."
103 104 
     if address_in_net 10.10.10.1 10.10.10.0/$mask; then
104 
-        echo "OK"
105 
+        passed "OK"
105 106 
     else
106 
-        echo "address_in_net() failed on /$mask"
107 
+        failed "address_in_net() failed on /$mask"
107 108 
     fi
108 109
109 110 
     echo -n "address_in_net(): not in /$mask..."
110 111 
     if ! address_in_net 10.10.10.1 11.11.11.0/$mask; then
111 
-        echo "OK"
112 
+        passed "OK"
112 113 
     else
113 
-        echo "address_in_net() failed on /$mask"
114 
+        failed "address_in_net() failed on /$mask"
114 115 
     fi
115 116 
 done
117 
+
118 
+report_results