Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-docker-packaging.t
author Martin von Zweigbergk <martinvonz@google.com>
Sat, 13 Apr 2019 00:24:17 -0700
changeset 42203 7815cf0ea88b
parent 33204 ddd65b4f3ae6
child 43556 e468ebfcb4ce
permissions -rw-r--r--
tests: add test for issue5343 (grafting with copies) It seems that issue5353 resulted in a lot of tests in test-graft.t, but the bug actually reported in that issue didn't get a test case. This patch adds one for the "move" and one for the "copy" version of it. I also added a "copy+modify" case, to show what should be a merge conflict. I didn't add one for the "backwards" version of it since the comment says that that was already covered by previous work. The tests added by this patch show the broken behavior (the bug is still open). I suspect the results returned from mergecopies() are not expressive enough to fix this issue: it has a dict for copies to merge with, but that can only give one more filename, but here we need two (one for the path on the remote side and one for the path in the merge base). I want to have it tested anyway since I'm about to refactor mergecopies(). Differential Revision: https://phab.mercurial-scm.org/D6242
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
#require test-repo slow docker
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 







29219






3c9066ed557c
tests: silence test-repo obsolete warning



timeless <timeless@mozdev.org>


parents: 
28973

diff
changeset




     3


  $ . "$TESTDIR/helpers-testrepo.sh"








33204






ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally



Yuya Nishihara <yuya@tcha.org>


parents: 
33128

diff
changeset




     4


  $ testrepohgenv








29219






3c9066ed557c
tests: silence test-repo obsolete warning



timeless <timeless@mozdev.org>


parents: 
28973

diff
changeset




     5









26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     6


Ensure debuild doesn't run the testsuite, as that could get silly.













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     7


  $ DEB_BUILD_OPTIONS=nocheck













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




     8


  $ export DEB_BUILD_OPTIONS








26146






8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


  $ OUTPUTDIR=`pwd`













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


  $ export OUTPUTDIR













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11














8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12


  $ cd "$TESTDIR"/..













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    13


  $ make docker-debian-jessie > $OUTPUTDIR/build.log 2>&1













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


  $ cd $OUTPUTDIR













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15


  $ ls *.deb








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    16


  mercurial-common_*.deb (glob)













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    17


  mercurial_*.deb (glob)








26146






8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18














8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


We check debian package contents with portable tools so that when













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20


we're on non-debian machines we can still test the packages that are













8c91726caeae
test-docker-packaging: test packages built using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21


built using docker.








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    22














7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    23


main deb should have .so but no .py













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    24


  $ ar x mercurial_*.deb













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    25


  $ tar tf data.tar* | egrep '(localrepo|parsers)'













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    26


  ./usr/lib/python2.7/dist-packages/mercurial/parsers*.so (glob)













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    27


mercurial-common should have .py but no .so or .pyc













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    28


  $ ar x mercurial-common_*.deb













7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    29


  $ tar tf data.tar* | egrep '(localrepo|parsers)'








28973






fc0f9714d077
test-docker-packaging: add new line to test output



Sean Farley <sean@farley.io>


parents: 
26148

diff
changeset




    30


  ./usr/lib/python2.7/dist-packages/mercurial/pure/parsers.py








26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26146

diff
changeset




    31


  ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py















hg-stable