[PATCH 2 of 2 v2] tests: move blackbox testing of tags to test-tags.t

[Gregory Szorc]

# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1428946117 14400
#      Mon Apr 13 13:28:37 2015 -0400
# Node ID 1791cb41a8e21b61c5f3ee76129d5070a5d573ac
# Parent  f8ea787cd2b077ba0c8eb6163cc69cf910842e2e
tests: move blackbox testing of tags to test-tags.t

We're going to refactor tags cache shortly. It is easier to test the
blackbox logging if these tests are in test-tags.t.

diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -111,34 +111,23 @@ backup bundles get logged
   1970/01/01 00:00:00 bob> updated base branch cache in ?.???? seconds (glob)
   1970/01/01 00:00:00 bob> wrote base branch cache with 1 labels and 2 nodes
   1970/01/01 00:00:00 bob> strip tip exited 0 after * seconds (glob)
 
-tags cache gets logged
-  $ hg up tip
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg tag -m 'create test tag' test-tag
-  $ hg tags
-  tip                                3:5b5562c08298
-  test-tag                           2:d02f48003e62
-  $ hg blackbox -l 3
-  1970/01/01 00:00:00 bob> resolved 1 tags cache entries from 1 manifests in ?.???? seconds (glob)
-  1970/01/01 00:00:00 bob> writing tags cache file with 2 heads and 1 tags
-  1970/01/01 00:00:00 bob> tags exited 0 after ?.?? seconds (glob)
-
 extension and python hooks - use the eol extension for a pythonhook
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'eol=' >> .hg/hgrc
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'update = echo hooked' >> .hg/hgrc
   $ hg update
   hooked
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg blackbox -l 4
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg blackbox -l 5
   1970/01/01 00:00:00 bob> update
-  1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob)
-  1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in * seconds (glob)
-  1970/01/01 00:00:00 bob> update exited 0 after * seconds (glob)
+  1970/01/01 00:00:00 bob> writing tags cache file with 2 heads and 0 tags
+  1970/01/01 00:00:00 bob> pythonhook-preupdate: hgext.eol.preupdate finished in 0.00 seconds
+  1970/01/01 00:00:00 bob> exthook-update: echo hooked finished in 0.00 seconds
+  1970/01/01 00:00:00 bob> update exited 0 after 0.04 seconds
 
 log rotation
 
   $ echo '[blackbox]' >> .hg/hgrc
@@ -147,9 +136,9 @@ log rotation
   $ hg status
   $ hg status
   $ hg status
   $ hg tip -q
-  3:5b5562c08298
+  2:d02f48003e62
   $ ls .hg/blackbox.log*
   .hg/blackbox.log
   .hg/blackbox.log.1
   .hg/blackbox.log.2
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -1,4 +1,12 @@
+setup
+
+  $ cat >> $HGRCPATH << EOF
+  > [extensions]
+  > blackbox=
+  > mock=$TESTDIR/mockblackbox.py
+  > EOF
+
 Helper functions:
 
   $ cacheexists() {
   >   [ -f .hg/cache/tags ] && echo "tag cache exists" || echo "no tag cache"
@@ -81,8 +89,20 @@ And again, but now unable to write tag c
   b9154636be93 tip
   $ chmod 755 .hg
 #endif
 
+Tag cache debug info written to blackbox log
+
+  $ rm -f .hg/cache/tags
+  $ hg identify
+  b9154636be93 tip
+  $ hg blackbox -l 4
+  1970/01/01 00:00:00 bob> identify
+  1970/01/01 00:00:00 bob> resolved 1 tags cache entries from 1 manifests in ?.???? seconds (glob)
+  1970/01/01 00:00:00 bob> writing tags cache file with 1 heads and 1 tags
+  1970/01/01 00:00:00 bob> identify exited 0 after ?.?? seconds (glob)
+
+
 Create a branch:
 
   $ echo bb > a
   $ hg status