killdaemons: close pid file before killing processes With #serve enabled on Windows, I was getting occasional stacktraces like this: Errored test-hgweb-json.t: Traceback (most recent call last): File "./run-tests.py", line 724, in run self.tearDown() File "./run-tests.py", line 805, in tearDown killdaemons(entry) File "./run-tests.py", line 540, in killdaemons logfn=vlog) File "...\tests\killdaemons.py", line 94, in killdaemons os.unlink(pidfile) WindowsError: [Error 32] The process cannot access the file because it is being used by another process: '...\\hgtests.zmpqj3\\child80\\daemon.pids' Adrian suggested using util.posixfile, which works. However, the 'mercurial' package isn't in sys.path when invoking run-tests.py, and it isn't clear that hacking[1] it in is a good thing (especially for test-run-tests.t, which uses an installation in a temp folder). I tried using ProcessMonitor to figure out what the other process is, but that monitoring slows things down to such a degree that the issue doesn't occur. I was ready to blame the virus scanner, but it happens without that too. Looking at the code, I don't see anything that would have the pid file open. But I was able to get through about 20 full test runs without an issue with this minor change, whereas before it was pretty certain to hit this at least once in two or three runs. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-May/097907.html

     1

#require no-icasefs

     2

     3

test file addition with colliding case

     4

     5

  $ hg init repo1

     6

  $ cd repo1

     7

  $ echo a > a

     8

  $ echo A > A

     9

  $ hg add a

    10

  $ hg st

    11

  A a

    12

  ? A

    13

  $ hg add --config ui.portablefilenames=abort A

    14

  abort: possible case-folding collision for A

    15

  [255]

    16

  $ hg st

    17

  A a

    18

  ? A

    19

  $ hg add A

    20

  warning: possible case-folding collision for A

    21

  $ hg st

    22

  A A

    23

  A a

    24

  $ hg forget A

    25

  $ hg st

    26

  A a

    27

  ? A

    28

  $ hg add --config ui.portablefilenames=no A

    29

  $ hg st

    30

  A A

    31

  A a

    32

  $ mkdir b

    33

  $ touch b/c b/D

    34

  $ hg add b

    35

  adding b/D

    36

  adding b/c

    37

  $ touch b/d b/C

    38

  $ hg add b/C

    39

  warning: possible case-folding collision for b/C

    40

  $ hg add b/d

    41

  warning: possible case-folding collision for b/d

    42

  $ touch b/a1 b/a2

    43

  $ hg add b

    44

  adding b/a1

    45

  adding b/a2

    46

  $ touch b/A2 b/a1.1

    47

  $ hg add b/a1.1 b/A2

    48

  warning: possible case-folding collision for b/A2

    49

  $ touch b/f b/F

    50

  $ hg add b/f b/F

    51

  warning: possible case-folding collision for b/f

    52

  $ touch g G

    53

  $ hg add g G

    54

  warning: possible case-folding collision for g

    55

  $ mkdir h H

    56

  $ touch h/x H/x

    57

  $ hg add h/x H/x

    58

  warning: possible case-folding collision for h/x

    59

  $ touch h/s H/s

    60

  $ hg add h/s

    61

  $ hg add H/s

    62

  warning: possible case-folding collision for H/s

    63

    64

case changing rename must not warn or abort

    65

    66

  $ echo c > c

    67

  $ hg ci -qAmx

    68

  $ hg mv c C

    69

  $ cd ..