tests/test-inotify-issue1556.t
author Angel Ezquerra <angel.ezquerra@gmail.com>
Tue, 13 Aug 2013 01:38:30 +0200
changeset 19638 20096384754f
parent 18593 895d65364570
permissions -rw-r--r--
mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions). # HG changeset patch # User Angel Ezquerra <angel.ezquerra@gmail.com> # Date 1376350710 -7200 # Tue Aug 13 01:38:30 2013 +0200 # Node ID 60897e264858cdcd46f89e27a702086f08adca02 # Parent 2defb5453f223c3027eb2f7788fbddd52bbb3352 mq: update subrepos when applying / unapplying patches that change .hgsubstate Up until now applying or unapplying a patch that modified .hgsubstate would not work as expected because it would not update the subrepos according to the .hgsubstate change. This made it very easy to lose subrepo changes when using mq. This revision also changes the test-mq-subrepo test so that on the qpop / qpush tests. We no longer use the debugsub command to check the state of the subrepos after the qpop and qpush operations. Instead we directly run the id command on the subrepos that we want to check. The reason is that using the debugsub command is misleading because it does not really check the state of the subrepos on the working directory (it just returns what the change that is specified on a given revision). Because of this the tests did not detect the problem that this revision fixes (i.e. that applying a patch did not update the subrepos to the corresponding revisions).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
     1
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     2
  $ "$TESTDIR/hghave" inotify || exit 80
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     3
  $ hg init
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     4
  $ touch a b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     5
  $ hg add a b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     6
  $ rm b
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
     7
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
     8
status without inotify
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
     9
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    10
  $ hg st
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    11
  A a
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    12
  ! b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    13
  $ echo "[extensions]" >> $HGRCPATH
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    14
  $ echo "inotify=" >> $HGRCPATH
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
    15
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    16
inserve
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
    17
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    18
  $ hg inserve -d --pid-file=hg.pid 2>&1
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    19
  $ cat hg.pid >> "$DAEMON_PIDS"
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    20
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    21
status
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
    22
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    23
  $ hg st
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    24
  A a
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    25
  ! b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    26
  ? hg.pid
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    27
  $ sleep 1
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
    28
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
    29
Are we able to kill the service? if not, the service died on some error
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
    30
18593
895d65364570 test-inotify-issue1556.t: migrate to killdaemons from kill `cat pidfile`
Augie Fackler <raf@durin42.com>
parents: 12456
diff changeset
    31
  $ "$TESTDIR/killdaemons.py" hg.pid