3 # Copyright (c) 2010 Hudson River Trading LLC
4 # Written by: John H. Baldwin <jhb@FreeBSD.org>
7 # Redistribution and use in source and binary forms, with or without
8 # modification, are permitted provided that the following conditions
10 # 1. Redistributions of source code must retain the above copyright
11 # notice, this list of conditions and the following disclaimer.
12 # 2. Redistributions in binary form must reproduce the above copyright
13 # notice, this list of conditions and the following disclaimer in the
14 # documentation and/or other materials provided with the distribution.
16 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 # Various regression tests to run for the 'resolve' command.
36 echo "Usage: conflicts.sh [-s script] [-w workdir]"
40 # Allow the user to specify an alternate work directory or script.
42 while getopts "s:w:" option; do
61 CONFLICTS=$WORKDIR/conflicts
66 # These tests deal with conflicts to a single file. For each test, we
67 # generate a conflict in /etc/login.conf. Each resolve option is tested
69 build_login_conflict()
72 rm -rf $OLD $NEW $TEST $CONFLICTS
73 mkdir -p $OLD/etc $NEW/etc $TEST/etc
75 # Generate a conflict in /etc/login.conf.
76 cat > $OLD/etc/login.conf <<EOF
80 cat > $NEW/etc/login.conf <<EOF
83 :copyright=/etc/COPYRIGHT
85 cat > $TEST/etc/login.conf <<EOF
91 $COMMAND -r -d $WORKDIR -D $TEST >/dev/null
94 # This is used to verify special handling for /etc/mail/aliases and
95 # the newaliases warning.
96 build_aliases_conflict()
99 rm -rf $OLD $NEW $TEST $CONFLICTS
100 mkdir -p $OLD/etc/mail $NEW/etc/mail $TEST/etc/mail
102 # Generate a conflict in /etc/mail/aliases
103 cat > $OLD/etc/mail/aliases <<EOF
106 # Basic system aliases -- these MUST be present
107 MAILER-DAEMON: postmaster
110 cat > $NEW/etc/mail/aliases <<EOF
113 # Basic system aliases -- these MUST be present
114 MAILER-DAEMON: postmaster
117 # General redirections for pseudo accounts
121 cat > $TEST/etc/mail/aliases <<EOF
122 root: someone@example.com
124 # Basic system aliases -- these MUST be present
125 MAILER-DAEMON: postmaster
129 $COMMAND -r -d $WORKDIR -D $TEST >/dev/null
132 # $1 - relative path to file that should be missing from TEST
135 if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
136 echo "File $1 should be missing"
140 # $1 - relative path to file that should be present in TEST
143 if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
144 echo "File $1 should be present"
148 # $1 - relative path to regular file that should be present in TEST
149 # $2 - optional string that should match file contents
150 # $3 - optional MD5 of the flie contents, overrides $2 if present
155 if ! [ -f $TEST/$1 ]; then
156 echo "File $1 should be a regular file"
157 elif [ $# -eq 2 ]; then
158 contents=`cat $TEST/$1`
159 if [ "$contents" != "$2" ]; then
160 echo "File $1 has wrong contents"
162 elif [ $# -eq 3 ]; then
163 sum=`md5 -q $TEST/$1`
164 if [ "$sum" != "$3" ]; then
165 echo "File $1 has wrong contents"
170 # $1 - relative path to a regular file that should have a conflict
171 # $2 - optional MD5 of the conflict file contents
176 if ! [ -f $CONFLICTS/$1 ]; then
177 echo "File $1 missing conflict"
178 elif [ $# -gt 1 ]; then
179 sum=`md5 -q $CONFLICTS/$1`
180 if [ "$sum" != "$2" ]; then
181 echo "Conflict $1 has wrong contents"
186 # $1 - relative path to a regular file that should no longer have a conflict
189 if [ -f $CONFLICTS/$1 ]; then
190 echo "Conflict $1 should be resolved"
194 if [ `id -u` -ne 0 ]; then
198 if [ -r /etc/etcupdate.conf ]; then
199 echo "WARNING: /etc/etcupdate.conf settings may break some tests."
202 # Test each of the following resolve options: 'p', 'mf', 'tf', 'r'.
206 # Verify that 'p' doesn't do anything.
208 echo 'p' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
210 file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd
211 missing /etc/login.conf.db
212 conflict /etc/login.conf
214 # Verify that 'mf' removes the conflict, but does nothing else.
215 echo "Checking 'mf':"
216 echo 'mf' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
218 file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd
219 missing /etc/login.conf.db
220 resolved /etc/login.conf
224 # Verify that 'tf' installs the new version of the file.
225 echo "Checking 'tf':"
226 echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
228 file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
229 file /etc/login.conf.db
230 resolved /etc/login.conf
234 # Verify that 'r' installs the resolved version of the file. To
235 # simulate this, manually edit the merged file so that it doesn't
236 # contain conflict markers.
238 cat > $CONFLICTS/etc/login.conf <<EOF
240 :passwd_format=md5:\\
241 :copyright=/etc/COPYRIGHT\\
245 echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
247 file /etc/login.conf "" 966e25984b9b63da8eaac8479dcb0d4d
248 file /etc/login.conf.db
249 resolved /etc/login.conf
251 build_aliases_conflict
253 # Verify that 'p' and 'mf' do not generate the newaliases warning.
254 echo "Checking newalias warning for 'p'":
255 echo 'p' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
256 if [ $? -eq 0 ]; then
257 echo "+ Extra warning"
259 echo "Checking newalias warning for 'mf'":
260 echo 'mf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
261 if [ $? -eq 0 ]; then
262 echo "+ Extra warning"
265 # Verify that 'tf' and 'r' do generate the newaliases warning.
266 build_aliases_conflict
267 echo "Checking newalias warning for 'tf'":
268 echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
269 if [ $? -ne 0 ]; then
270 echo "- Missing warning"
273 build_aliases_conflict
274 cp $TEST/etc/mail/aliases $CONFLICTS/etc/mail/aliases
275 echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
276 if [ $? -ne 0 ]; then
277 echo "- Missing warning"