tests/test-docker-packaging.t
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sun, 14 Feb 2016 01:33:55 +0900
changeset 28119 91a827e760df
parent 26148 7f49efcaa9b4
child 28973 fc0f9714d077
permissions -rw-r--r--
hg: make cachedlocalrepo cache appropriate repoview object Before this patch, 'cachedlocalrepo' always caches "visible" repoview object, because 'cachedlocalrepo' uses "visible" repoview returned by 'hg.repository()' without any additional processing. If the client of 'cachedlocalrepo' wants "served" repoview, some objects to be cached are discarded unintentionally. 1. 'cachedlocalrepo' newly caches "visible" repoview object (call it VIEW1) 2. 'cachedlocalrepo' returns VIEW1 to the client of it at 'fetch()' 3. the client gets "served" repoview object by 'filtered("served")' on VIEW1 (call this "served" repoview VIEW2) 4. accessing to 'repo.changelog' implies: - instantiation of changelog via 'localrepository.changelog' - instantiation of "filtered changelog" via 'repoview.changelog' 5. "filtered changelog" above is cached in VIEW2 6. VIEW2 is discarded after processing, because there is no reference to it 7. 'cachedlocalrepo' returns VIEW1 cached at (1) above to the client at next 'fetch()' 8. 'filtered("served")' on VIEW1 at the client side creates new "served" repoview again, because VIEW1 is "visible" (call this new "served" repoview VIEW3) 9. accessing to 'repo.changelog' implies instantiation of filtered changelog again, because "filtered changelog" is cached in VIEW2 at (5), but not in VIEW3 currently used 10. (go to (7) above) As described above, "served" repoview object and "filtered changelog" cached in it are discarded always, even if the repository itself hasn't been changed since last access. For example, in the case of 'hgweb_mod.hgweb', "newly caching" occurs, when: - all cached objects are already assigned to another threads (in this case, repoview is created in 'cachedlocalrepo.copy()') - or, stat of '00changelog.i' is changed from last access (in this case, repoview is created in 'cachedlocalrepo.fetch()') once changes are pushed via HTTP, this always occurs. The root cause of this inefficiency is that 'cachedlocalrepo' always caches "visible" repoview object, even if the client of it wants another view. To make 'cachedlocalrepo' cache appropriate repoview object, this patch adds additional filtering on the repo object returned by 'hg.repository()'. It is assumed that initial repoview object should be already filtered by expected view. After this patch: - 'filtered("served")' on VIEW1 at (3)/(7) above returns VIEW1 itself, because VIEW1 is now "served", and - VIEW2 and VIEW3 equal VIEW1 - therefore, "filtered changelog" is cached in VIEW1, and reused intentionally
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
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
     3
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
     4
  $ 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
     5
  $ export DEB_BUILD_OPTIONS
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     6
  $ OUTPUTDIR=`pwd`
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     7
  $ export OUTPUTDIR
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     8
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
     9
  $ cd "$TESTDIR"/..
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    10
  $ 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
    11
  $ cd $OUTPUTDIR
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    12
  $ ls *.deb
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    13
  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
    14
  mercurial_*.deb (glob)
26146
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    15
8c91726caeae test-docker-packaging: test packages built using docker
Augie Fackler <augie@google.com>
parents:
diff changeset
    16
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
    17
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
    18
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
    19
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26146
diff changeset
    20
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
    21
  $ 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
    22
  $ 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
    23
  ./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
    24
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
    25
  $ 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
    26
  $ 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
    27
  ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py