# HG changeset patch # User Marcin Kasperski # Date 1482093765 -3600 # Node ID 91efe98be0625f5495f99aa1fa7e998228feecf2 # Parent 030b8a638ccf4ebb70b1b3898eb721b7aed7fd75 . diff -r 030b8a638ccf -r 91efe98be062 tests/basic.t --- a/tests/basic.t Sun Dec 18 21:16:04 2016 +0100 +++ b/tests/basic.t Sun Dec 18 21:42:45 2016 +0100 @@ -220,15 +220,11 @@ adding br1.txt $ hg --cwd $BASE commit -m 'Br1' -Slightly tweaky way to update is to defeat mercurial 4.0 warning -spuriously showing up during automated tests. It used to be -$ hg --cwd $BASE update default -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +Filtering out warnings in command below avoids hg 4.0 warning about +current directory removal which for some mysterious reason shows up +only during drone testing. - $ cd $BASE - $ pwd - /tmp/cramtests-*/basic.t/work/base (glob) - $ hg update default # --cwd $BASE + $ hg --cwd $BASE update default 2>/dev/null 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cat >> $BASE/file.txt << EOF diff -r 030b8a638ccf -r 91efe98be062 tests/groups-legacy.t --- a/tests/groups-legacy.t Sun Dec 18 21:16:04 2016 +0100 +++ b/tests/groups-legacy.t Sun Dec 18 21:42:45 2016 +0100 @@ -278,7 +278,7 @@ $ cd $BASE $ pwd /tmp/cramtests-*/groups-legacy.t/work/base (glob) - $ hg update default # --cwd $BASE + $ hg update default 2>/dev/null # --cwd $BASE 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cat >> $BASE/file.txt << EOF > later text diff -r 030b8a638ccf -r 91efe98be062 tests/groups-modern.t --- a/tests/groups-modern.t Sun Dec 18 21:16:04 2016 +0100 +++ b/tests/groups-modern.t Sun Dec 18 21:42:45 2016 +0100 @@ -300,7 +300,7 @@ $ cd $BASE $ pwd /tmp/cramtests-*/groups-modern.t/work/base (glob) - $ hg update default # --cwd $BASE + $ hg update default 2>/dev/null # --cwd $BASE 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cat >> $BASE/file.txt << EOF > later text diff -r 030b8a638ccf -r 91efe98be062 tox.ini --- a/tox.ini Sun Dec 18 21:16:04 2016 +0100 +++ b/tox.ini Sun Dec 18 21:42:45 2016 +0100 @@ -36,4 +36,4 @@ commands = cram -v tests whitelist_externals = - mkdir + mkdir cd pwd