some test changes
authorTed Mielczarek <ted.mielczarek@gmail.com>
Thu, 13 Nov 2008 13:56:33 -0500
changeset 359100 b1c85f434eb7dad3270d018c4640b452d089e39f
parent 359097 55f0ec2ea601a5eace46c50928bf722d1b6ead41
child 359101 a17bf3063b3fe46f4de5e40e87832582b37512fb
push id16998
push userrwood@mozilla.com
push dateMon, 02 May 2016 19:42:03 +0000
some test changes
hghooks/test-hook.sh
hghooks/test-lots-of-checkins.sh
hghooks/test-merges.sh
--- a/hghooks/test-hook.sh
+++ b/hghooks/test-hook.sh
@@ -19,30 +19,30 @@ pretxnchangegroup.z_linearhistory = pyth
 EOF
 
 # now clone it, then commit and push some things
 hg clone $REPO $CLONE
 
 # push two changes together first
 echo "checkin 1" > $CLONE/testfile
 hg add -R $CLONE $CLONE/testfile
-hg ci -R $CLONE -m "checkin 1"
+hg ci -R $CLONE -m "checkin 1 bug 12345"
 
 echo "checkin 2" >> $CLONE/testfile
-hg ci -R $CLONE -m "checkin 2"
+hg ci -R $CLONE -m "checkin 2 b=123456"
 hg push -R $CLONE $REPO
 
 # then one separately
 echo "checkin 3" >> $CLONE/testfile
-hg ci -R $CLONE -m "checkin 3"
+hg ci -R $CLONE -m "checkin 3 - bug345664"
 hg push -R $CLONE $REPO
 
 # then three together
 echo "checkin 4" >> $CLONE/testfile
-hg ci -R $CLONE -m "checkin 4"
+hg ci -R $CLONE -m "checkin 4 b=111111"
 
 echo "checkin 5" >> $CLONE/testfile
 hg ci -R $CLONE -m "checkin 5"
 
 echo "checkin 6" >> $CLONE/testfile
 hg ci -R $CLONE -m "checkin 6"
 hg push -R $CLONE $REPO
 
--- a/hghooks/test-lots-of-checkins.sh
+++ b/hghooks/test-lots-of-checkins.sh
@@ -23,24 +23,24 @@ EOF
 hg clone $REPO $CLONE
 
 # push lots of changes
 echo "checkin 1" > $CLONE/testfile
 hg add -R $CLONE $CLONE/testfile
 hg ci -R $CLONE -m "checkin 1"
 hg push -R $CLONE $REPO;
 
-for ((i=2; $i<=50; i++)); do
+for ((i=2; $i<=200; i++)); do
   echo "checkin $i" >> $CLONE/testfile;
   hg ci -R $CLONE -m "checkin $i";
   hg push -R $CLONE $REPO;
 done
 
 # Test total push count
-EXPECTED_PUSHCOUNT=50
+EXPECTED_PUSHCOUNT=200
 PUSHCOUNT=`echo "SELECT COUNT(*) FROM pushlog;" | sqlite3 $REPO/.hg/pushlog2.db`
 if [[ "$PUSHCOUNT" != "$EXPECTED_PUSHCOUNT" ]]; then
     echo "FAIL: push count $PUSHCOUNT != $EXPECTED_PUSHCOUNT";
     exit 1;
 else
     echo "PASS: push count correct";
 fi
 
--- a/hghooks/test-merges.sh
+++ b/hghooks/test-merges.sh
@@ -73,18 +73,41 @@ hg push -R $CLONE $REPO
 # check in a few more things just for kicks
 echo "checkin 5" >> $CLONE/testfile
 hg ci -R $CLONE -m "checkin 5"
 
 echo "checkin 6" >> $CLONE/testfile
 hg ci -R $CLONE -m "checkin 6"
 hg push -R $CLONE $REPO
 
+# More branch checkins
+echo "checkin 6" > $BRANCH/testfile2
+hg ci -R $BRANCH -m "branch checkin 6"
+
+echo "checkin 7" > $BRANCH/testfile2
+hg ci -R $BRANCH -m "branch checkin 7"
+
+echo "checkin 8" > $BRANCH/testfile2
+hg ci -R $BRANCH -m "branch checkin 8"
+
+echo "checkin 9" > $BRANCH/testfile2
+hg ci -R $BRANCH -m "branch checkin 9"
+
+echo "checkin 10" > $BRANCH/testfile2
+hg ci -R $BRANCH -m "branch checkin 10"
+
+# Now merge from branch
+hg pull -R $CLONE $BRANCH
+hg update -R $CLONE
+hg merge -R $CLONE
+hg ci -R $CLONE -m "merge from hg-test-branch"
+hg push -R $CLONE $REPO
+
 # Test total push count
-EXPECTED_PUSHCOUNT=5
+EXPECTED_PUSHCOUNT=6
 PUSHCOUNT=`echo "SELECT COUNT(*) FROM pushlog;" | sqlite3 $REPO/.hg/pushlog2.db`
 if [[ "$PUSHCOUNT" != "$EXPECTED_PUSHCOUNT" ]]; then
     echo "FAIL: push count $PUSHCOUNT != $EXPECTED_PUSHCOUNT";
     exit 1;
 else
     echo "PASS: push count correct";
 fi