tests/README
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 350 b4e0e20646bb
child 761 0fb498458905
permissions -rw-r--r--
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     1
A simple testing framework
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     2
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
     3
To run the tests, do:
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
     4
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
     5
cd tests/
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
     6
./run-tests
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
     7
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     8
This finds all scripts in the test directory named test-* and executes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
them. The scripts can be either shell scripts or Python. Each test is
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
run in a temporary directory that is removed when the test is complete.
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    11
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
A test-<x> succeeds if the script returns success and its output
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    13
matches test-<x>.out. If the new output doesn't match, it is stored in
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    14
test-<x>.err.
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    15
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    16
There are some tricky points here that you should be aware of when
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    17
writing tests:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    18
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    19
- hg commit and hg up -m want user interaction
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    20
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    21
  for commit use -t "text"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    22
  for hg up -m, set HGMERGE to something noninteractive (like true or merge)
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    23
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
- changeset hashes will change based on user and date which make
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
  things like hg history output change
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    26
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    27
  use commit -t "test" -u test -d "0 0"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    28
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    29
- diff will show the current time
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    30
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    31
  use hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" to strip dates
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    32
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    33
- set -x and pipelines don't generate stable output
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    34
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    35
  turn off set -x or break pipelines into pieces
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
    36