Commits

Pierre-Yves David committed 395ce0c

test: stronger temporary dir glob

The tests fails when the temporary directory is not in /tmp (mine is in
/dev/shm). This changeset updates the glob to works in more case.

Having the value of $CRAMTMP substituted as CRAMTMP (as mercurial itself does)
would be great. But that is a bug fix for cram itself.

  • Participants
  • Parent commits 06cd591

Comments (0)

Files changed (8)

File tests/test-clone-missing.t

   $ mv ../two ../two-moved
   $ hg grpull
   cloning mygr1
-  repository /tmp/*/test-clone-missing.t/one not found (glob)
+  repository /*/cramtests-*/test-clone-missing.t/one not found (glob)
   cloning mygr2
-  repository /tmp/*/test-clone-missing.t/two not found (glob)
+  repository /*/cramtests-*/test-clone-missing.t/two not found (glob)
   cloning mygr3
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   
   finished with errors
   
-  mygr1: repository /tmp/*/test-clone-missing.t/one not found (glob)
+  mygr1: repository /*/cramtests-*/test-clone-missing.t/one not found (glob)
   verifying mygr1
-  repository /tmp/*/test-clone-missing.t/host/mygr1 not found (glob)
+  repository /*/cramtests-*/test-clone-missing.t/host/mygr1 not found (glob)
   
-  mygr2: repository /tmp/*/test-clone-missing.t/two not found (glob)
+  mygr2: repository /*/cramtests-*/test-clone-missing.t/two not found (glob)
   verifying mygr2
-  repository /tmp/*/test-clone-missing.t/host/mygr2 not found (glob)
+  repository /*/cramtests-*/test-clone-missing.t/host/mygr2 not found (glob)
   [1]
 
 

File tests/test-cyclicguest.t

   cloning host
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  Detected guestrepo cycle: /tmp/*/test-cyclicguest.t/guest (glob)
+  Detected guestrepo cycle: /*/cramtests-*/test-cyclicguest.t/guest (glob)
   
   finished with errors
   
-  guest: Detected guestrepo cycle: /tmp/*/test-cyclicguest.t/guest (glob)
+  guest: Detected guestrepo cycle: /*/cramtests-*/test-cyclicguest.t/guest (glob)
   verifying guest
-  repository /tmp/*/test-cyclicguest.t/host/guest/host/guest not found (glob)
+  repository /*/cramtests-*/test-cyclicguest.t/host/guest/host/guest not found (glob)
   [1]
 
 

File tests/test-dirtyupdate.t

   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo changed > mygr1/f
   $ hg grupdate
-  abort: repository /tmp/*/test-dirtyupdate.t/host/mygr1 contains uncommitted changes (glob)
+  abort: repository /*/cramtests-*/test-dirtyupdate.t/host/mygr1 contains uncommitted changes (glob)
   [255]

File tests/test-error-reporting.t

   $ mv ../two ../two-moved
   $ hg grpull
   cloning mygr1
-  repository /tmp/*/test-error-reporting.t/one not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
   cloning mygr2
-  repository /tmp/*/test-error-reporting.t/two not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
   cloning mygr3
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   
   finished with errors
   
-  mygr1: repository /tmp/*/test-error-reporting.t/one not found (glob)
+  mygr1: repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
   verifying mygr1
-  repository /tmp/*/test-error-reporting.t/host/mygr1 not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/host/mygr1 not found (glob)
   
-  mygr2: repository /tmp/*/test-error-reporting.t/two not found (glob)
+  mygr2: repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
   verifying mygr2
-  repository /tmp/*/test-error-reporting.t/host/mygr2 not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/host/mygr2 not found (glob)
   [1]
 
 
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   pulling mygr3
-  pulling from /tmp/*/test-error-reporting.t/three (glob)
+  pulling from /*/cramtests-*/test-error-reporting.t/three (glob)
   searching for changes
   no changes found
 
   $ mv ../one ../one-moved
   $ mv ../two ../two-moved
   $ hg grpush
-  pushing to /tmp/*/test-error-reporting.t/one (glob)
-  repository /tmp/*/test-error-reporting.t/one not found (glob)
-  pushing to /tmp/*/test-error-reporting.t/two (glob)
-  repository /tmp/*/test-error-reporting.t/two not found (glob)
-  pushing to /tmp/*/test-error-reporting.t/three (glob)
+  pushing to /*/cramtests-*/test-error-reporting.t/one (glob)
+  repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
+  pushing to /*/cramtests-*/test-error-reporting.t/two (glob)
+  repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
+  pushing to /*/cramtests-*/test-error-reporting.t/three (glob)
   searching for changes
   no changes found
   
   finished with errors
   
-  mygr1: repository /tmp/*/test-error-reporting.t/one not found (glob)
+  mygr1: repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
   verifying mygr1
   checking changesets
   checking manifests
   checking files
   1 files, 1 changesets, 1 total revisions
   
-  mygr2: repository /tmp/*/test-error-reporting.t/two not found (glob)
+  mygr2: repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
   verifying mygr2
   checking changesets
   checking manifests
 Try to pull from missing repos
   $ hg grpull
   pulling mygr1
-  repository /tmp/*/test-error-reporting.t/one not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
   pulling mygr2
-  repository /tmp/*/test-error-reporting.t/two not found (glob)
+  repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
   pulling mygr3
-  pulling from /tmp/*/test-error-reporting.t/three (glob)
+  pulling from /*/cramtests-*/test-error-reporting.t/three (glob)
   searching for changes
   no changes found
   
   finished with errors
   
-  mygr1: repository /tmp/*/test-error-reporting.t/one not found (glob)
+  mygr1: repository /*/cramtests-*/test-error-reporting.t/one not found (glob)
   verifying mygr1
   checking changesets
   checking manifests
   checking files
   1 files, 1 changesets, 1 total revisions
   
-  mygr2: repository /tmp/*/test-error-reporting.t/two not found (glob)
+  mygr2: repository /*/cramtests-*/test-error-reporting.t/two not found (glob)
   verifying mygr2
   checking changesets
   checking manifests

File tests/test-guest-arguments.t

 
 Test push and pull
   $ hg grpush two three
-  pushing to /tmp/*/test-guest-arguments.t/two (glob)
+  pushing to /*/cramtests-*/test-guest-arguments.t/two (glob)
   searching for changes
   no changes found
-  pushing to /tmp/*/test-guest-arguments.t/three (glob)
+  pushing to /*/cramtests-*/test-guest-arguments.t/three (glob)
   searching for changes
   no changes found
 
 
   $ hg grpull two three
   pulling two
-  pulling from /tmp/*/test-guest-arguments.t/two (glob)
+  pulling from /*/cramtests-*/test-guest-arguments.t/two (glob)
   searching for changes
   no changes found
   pulling three
-  pulling from /tmp/*/test-guest-arguments.t/three (glob)
+  pulling from /*/cramtests-*/test-guest-arguments.t/three (glob)
   searching for changes
   no changes found
 

File tests/test-in.t

   $ cd host
   $ hg grin
   searching for changes
-  comparing with /tmp/cramtests-*/test-in.t/gr1 (glob)
+  comparing with /*/cramtests-*/test-in.t/gr1 (glob)
   changeset:   1:* (glob)
   user:        * (glob)
   date:        .+ (re)
   summary:     adding something
   
   searching for changes
-  comparing with /tmp/cramtests-*/test-in.t/gr2 (glob)
+  comparing with /*/cramtests-*/test-in.t/gr2 (glob)
   no changes found
 
 

File tests/test-out.t

   $ cd $TESTDIR/host
   $ hg grout
   searching for changes
-  comparing with /tmp/cramtests-*/test-out.t/gr1 (glob)
+  comparing with /*/cramtests-*/test-out.t/gr1 (glob)
   changeset:   1:* (glob)
   tag:         tip
   user:        * (glob)
   summary:     1
   
   searching for changes
-  comparing with /tmp/cramtests-*/test-out.t/gr2 (glob)
+  comparing with /*/cramtests-*/test-out.t/gr2 (glob)
   changeset:   1:* (glob)
   tag:         tip
   user:        * (glob)

File tests/test-push.t

 Push the changes
   $ cd $TESTDIR/host
   $ hg grpush
-  pushing to /tmp/*/test-push.t/gr1 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr1 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing to /tmp/*/test-push.t/gr2 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr2 (glob)
   searching for changes
   adding changesets
   adding manifests
   $ cd $TESTDIR/host
   $ echo mygr-name = `readlink -f -n ../gr1clone` > .hggrmapping
   $ hg grpush
-  pushing to /tmp/*/test-push.t/gr1 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr1 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing to /tmp/*/test-push.t/gr2 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr2 (glob)
   searching for changes
   no changes found
 
 Push again with --local and verifiy that it used the uncommited version
   $ cd $TESTDIR/host
   $ hg grpush --local
-  pushing to /tmp/*/test-push.t/gr1clone (glob)
+  pushing to /*/cramtests-*/test-push.t/gr1clone (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing to /tmp/*/test-push.t/gr2 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr2 (glob)
   searching for changes
   no changes found
 
   $ hg commit -m "c3"
   $ cd $TESTDIR/host
   $ hg grpush --new-branch
-  pushing to /tmp/cramtests-*/test-push.t/gr1 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr1 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pushing to /tmp/*/test-push.t/gr2 (glob)
+  pushing to /*/cramtests-*/test-push.t/gr2 (glob)
   searching for changes
   no changes found