[PATCH] tests: unify test-default-push
Adrian Buehlmann
adrian at cadifra.com
Tue Sep 14 15:58:23 CDT 2010
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1284497644 -7200
# Node ID d5f7c5a511787eda482b12d1e9ba35fa3bb9884d
# Parent fcd280aa5d1c006c78a5a929d2c6a350c3590337
tests: unify test-default-push
diff --git a/tests/test-default-push.out b/tests/test-default-push.out
deleted file mode 100644
--- a/tests/test-default-push.out
+++ /dev/null
@@ -1,19 +0,0 @@
-adding a
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% push should push to default when default-push not set
-pushing
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-% push should push to default-push when set
-pushing
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
diff --git a/tests/test-default-push b/tests/test-default-push.t
old mode 100755
new mode 100644
rename from tests/test-default-push
rename to tests/test-default-push.t
--- a/tests/test-default-push
+++ b/tests/test-default-push.t
@@ -1,18 +1,38 @@
-#!/bin/sh
+ $ hg init a
-hg init a
-echo a > a/a
-hg --cwd a ci -Ama
+ $ echo a > a/a
+ $ hg --cwd a ci -Ama
+ adding a
-hg clone a c
+ $ hg clone a c
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-hg clone a b
-echo b >> b/a
-hg --cwd b ci -mb
+ $ hg clone a b
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-echo % push should push to default when default-push not set
-hg --cwd b push | sed 's/pushing to.*/pushing/'
+ $ echo b >> b/a
+ $ hg --cwd b ci -mb
-echo % push should push to default-push when set
-echo 'default-push = ../c' >> b/.hg/hgrc
-hg --cwd b push | sed 's/pushing to.*/pushing/'
+Push should push to 'default' when 'default-push' not set:
+
+ $ hg --cwd b push
+ pushing to .*/a
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+
+Push should push to 'default-push' when set:
+
+ $ echo 'default-push = ../c' >> b/.hg/hgrc
+ $ hg --cwd b push
+ pushing to .*/c
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+
More information about the Mercurial-devel
mailing list