← Back to branch summary

~ubuntu-branches/ubuntu/raring/maradns/raring

« back to all changes in this revision

Viewing changes to update/1.4.02/maradns-1.4.01-wonky-tests.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kai Hendry
  • Date: 2010-01-24 12:17:40 UTC
  • mfrom: (1.1.13 upstream) (10.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100124121740-a4e1fjobwaouz443
Tags: 1.4.02-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
update/1.4.02/maradns-1.4.01-wonky-tests.patch
 
1
--- maradns-1.4.01/sqa/regressions/do.tests     2009-02-13 02:18:31.000000000 -0600
 
2
+++ maradns-1.4.02/sqa/regressions/do.tests     2010-01-07 22:20:16.000000000 -0600
 
3
@@ -21,15 +21,28 @@
 
4
 fi
 
5
 
 
6
 # Tests to make sure most Mararc parameters work
 
7
-TESTS="mararc_n_admin_acl "
 
8
-TESTS=$TESTS"mararc_n_bind_address "
 
9
+
 
10
+# These tests are a little wonky are are done first
 
11
+# Try again if any of these tests fail
 
12
+WONKY="mararc_n_admin_acl "
 
13
+WONKY=$WONKY"mararc_n_default_rrany_set "
 
14
+WONKY=$WONKY"mararc_n_max_glueless_level "
 
15
+WONKY=$WONKY"mararc_n_max_queries_total "
 
16
+WONKY=$WONKY"mararc_n_min_ttl "
 
17
+WONKY=$WONKY"mararc_n_min_ttl_cname "
 
18
+WONKY=$WONKY"mararc_n_min_visible_ttl "
 
19
+WONKY=$WONKY"mararc_n_recursive_acl "
 
20
+WONKY=$WONKY"mararc_n_spammers "
 
21
+WONKY=$WONKY"mararc_n_synth_soa_serial "
 
22
+
 
23
+# Normal tests
 
24
+TESTS="mararc_n_bind_address "
 
25
 TESTS=$TESTS"mararc_n_bind_star_handling "
 
26
 TESTS=$TESTS"mararc_n_chroot_dir "
 
27
 TESTS=$TESTS"mararc_n_csv2_default_zonefile "
 
28
 TESTS=$TESTS"mararc_n_csv2_synthip_list "
 
29
 TESTS=$TESTS"mararc_n_csv2_tilde_handling "
 
30
 TESTS=$TESTS"mararc_n_debug_msg_level "
 
31
-TESTS=$TESTS"mararc_n_default_rrany_set "
 
32
 TESTS=$TESTS"mararc_n_dns_port "
 
33
 TESTS=$TESTS"mararc_n_dos_protection_level "
 
34
 TESTS=$TESTS"mararc_n_handle_noreply "
 
35
@@ -39,19 +52,11 @@
 
36
 TESTS=$TESTS"mararc_n_maradns_uid "
 
37
 TESTS=$TESTS"mararc_n_max_ar_chain "
 
38
 TESTS=$TESTS"mararc_n_max_chain "
 
39
-TESTS=$TESTS"mararc_n_max_glueless_level "
 
40
-TESTS=$TESTS"mararc_n_max_queries_total "
 
41
 TESTS=$TESTS"mararc_n_max_total "
 
42
-TESTS=$TESTS"mararc_n_min_ttl "
 
43
-TESTS=$TESTS"mararc_n_min_ttl_cname "
 
44
-TESTS=$TESTS"mararc_n_min_visible_ttl "
 
45
 TESTS=$TESTS"mararc_n_notthere_ip "
 
46
 TESTS=$TESTS"mararc_n_recurse_delegation "
 
47
-TESTS=$TESTS"mararc_n_recursive_acl "
 
48
 TESTS=$TESTS"mararc_n_remote_admin "
 
49
-TESTS=$TESTS"mararc_n_spammers "
 
50
 TESTS=$TESTS"mararc_n_synth_soa_origin "
 
51
-TESTS=$TESTS"mararc_n_synth_soa_serial "
 
52
 TESTS=$TESTS"mararc_n_timestamp_type "
 
53
 TESTS=$TESTS"mararc_n_upstream_port "
 
54
 TESTS=$TESTS"mararc_n_verbose_level "
 
55
@@ -83,6 +88,38 @@
 
56
 # 192.168.1.116, 172.16.116.70, 10.1.2.3, and 126.254.254.9)
 
57
 TESTS=$TESTS"private_ips "
 
58
 
 
59
+for test in $WONKY ; do
 
60
+       cd $test
 
61
+       sh ./do.test > output.test
 
62
+       sleep 2
 
63
+       if ! cmp output.success output.test > /dev/null 2>&1 ; then
 
64
+               echo test $test failed\; trying again
 
65
+               sleep 30
 
66
+               sh ./do.test > output.test
 
67
+               sleep 2
 
68
+               if ! cmp output.success output.test > /dev/null 2>&1 ; then
 
69
+                       echo test $test failed again
 
70
+                       sleep 60
 
71
+                       sh ./do.test > output.test
 
72
+                       sleep 2
 
73
+                       if ! cmp output.success output.test > /dev/null 2>&1 
 
74
+                               then
 
75
+                               echo $test failed again\; giving up
 
76
+                               exit 1
 
77
+                       else
 
78
+                               echo $test finally succeeded
 
79
+                       fi
 
80
+               
 
81
+               else
 
82
+                       echo test $test succeeded this time
 
83
+               fi
 
84
+       else
 
85
+               echo test $test succeeded
 
86
+       fi
 
87
+       cd ..
 
88
+done
 
89
+
 
90
+       
 
91
 for test in $TESTS ; do
 
92
        cd $test
 
93
        sh ./do.test > output.test
 
94
@@ -96,3 +133,5 @@
 
95
        cd ..
 
96
 done
 
97
 
 
98
+echo All tests successful
 
99
+