1 patch for repository zooko@dev.allmydata.org:/home/darcs/tahoe-lafs/trunk:

Sat Jan  1 16:22:12 MST 2011  zooko@zooko.com
  * setup: a test intended to exercise the problem described in #1246
  However, I am not sure that this test successfully exercises that problem.

New patches:

[setup: a test intended to exercise the problem described in #1246
zooko@zooko.com**20110101232212
 Ignore-this: b4862ba48f4cb42896190b5fb27757c3
 However, I am not sure that this test successfully exercises that problem.
] {
addfile ./misc/build_helpers/test-dists-in-shared-directory.py
hunk ./misc/build_helpers/test-dists-in-shared-directory.py 1
+#!/usr/bin/env python
+
+import StringIO, glob, os, platform, shutil, subprocess, sys, tarfile, zipfile
+import pkg_resources
+
+def test():
+    # We put a fake "pycryptopp 0.5.13" packagedir into a directory
+    # named packages1, and a fake "pycryptopp 99.0.0" into a directory
+    # named packages2, and a fake "zfec 1.1.0" packagedir into
+    # packages1.  The "pycryptopp 0.5.13" in packages1 is
+    # booby-trapped so that it will raise an exception when you import
+    # it.
+
+    # Then we run "python setup.py test -s
+    # buildtest.test_dists_in_shared_directory", which imports
+    # pycryptopp and passes if pycryptopp.__version__ == '99.0.0'.
+
+    # (Note that for this test to make sense, tahoe-lafs needs to be
+    # asking for a version of pycryptopp which can be satisfied by
+    # 99.0.0 but not by 0.5.13. At the time of this writing it
+    # requires >= 0.5.20 on x86 and >= 0.5.14 on other architectures.)
+
+    temp_dir = 'tmpdir-for-test-dists-in-shared-directory'
+    fake_pkgdir1 = 'packages1'
+    fake_pkgdir2 = 'packages2'
+    fake_distname = "pycryptopp"
+    fake_goodversion = "99.0.0"
+    fake_badversion = "0.5.13"
+    fake_goodinit = "__version__ = '%s'" % (fake_goodversion,)
+    fake_badinit = "raise Exception('Aha I caught you trying to import me. I am a fake pycryptopp 0.5.13 package and you should be require a newer version than me.')"
+
+    testsuite = "buildtest.test_dists_in_shared_directory"
+
+    pkgdir1dirname = os.path.join(os.getcwd(), temp_dir, fake_pkgdir1)
+    pkgdir2dirname = os.path.join(os.getcwd(), temp_dir, fake_pkgdir2)
+
+    try:
+        os.makedirs(pkgdir1dirname)
+    except OSError:
+        # probably already exists
+        pass
+    try:
+        os.makedirs(os.path.join(pkgdir1dirname, 'zfec'))
+    except OSError:
+        # probably already exists
+        pass
+    try:
+        open(os.path.join(pkgdir1dirname, 'zfec', '__init__.py'), 'w')
+    except OSError:
+        # probably already exists
+        pass
+    zfec_egginfo_name = os.path.join(pkgdir1dirname, '%s-%s-py%s.%s-%s.egg-info' % ('zfec', '1.1.0', platform.python_version_tuple()[0], platform.python_version_tuple()[1], pkg_resources.get_supported_platform()))
+    try:
+        open(zfec_egginfo_name, 'w')
+    except OSError:
+        # probably already exists
+        pass
+
+    try:
+        os.makedirs(os.path.join(pkgdir1dirname, 'pycryptopp'))
+    except OSError:
+        # probably already exists
+        pass
+    try:
+        open(os.path.join(pkgdir1dirname, 'pycryptopp', '__init__.py'), 'w').write(fake_badinit)
+    except OSError:
+        # probably already exists
+        pass
+    pycryptopp_egginfo_name = os.path.join(pkgdir1dirname, '%s-%s-py%s.%s-%s.egg-info' % ('pycryptopp', '0.5.13', platform.python_version_tuple()[0], platform.python_version_tuple()[1], pkg_resources.get_supported_platform()))
+    try:
+        open(pycryptopp_egginfo_name, 'w')
+    except OSError:
+        # probably already exists
+        pass
+
+    try:
+        os.makedirs(pkgdir2dirname)
+    except OSError:
+        # probably already exists
+        pass
+
+    try:
+        os.makedirs(os.path.join(pkgdir2dirname, 'pycryptopp'))
+    except OSError:
+        # probably already exists
+        pass
+    try:
+        open(os.path.join(pkgdir2dirname, 'pycryptopp', '__init__.py'), 'w').write(fake_goodinit)
+    except OSError:
+        # probably already exists
+        pass
+    pycryptopp_egginfo_name = os.path.join(pkgdir2dirname, '%s-%s-py%s.%s-%s.egg' % ('pycryptopp', '0.5.24', platform.python_version_tuple()[0], platform.python_version_tuple()[1], pkg_resources.get_supported_platform()))
+    try:
+        open(pycryptopp_egginfo_name, 'w')
+    except OSError:
+        # probably already exists
+        pass
+
+    os.chdir('src')
+    trial=os.path.join(os.getcwd(), '..', 'misc', 'build_helpers', 'run_trial.py')
+    os.environ['PATH']=os.getcwd()+os.pathsep+os.environ['PATH']
+    eggs = [os.path.realpath(p) for p in glob.glob(os.path.join('..', '*.egg'))]
+    os.environ['PYTHONPATH']=os.pathsep+pkgdir1dirname+os.pathsep+pkgdir2dirname+os.pathsep+os.pathsep.join(eggs)+os.pathsep+os.environ.get('PYTHONPATH','')
+    sys.exit(subprocess.call([sys.executable, trial, testsuite], env=os.environ))
+
+if __name__ == '__main__':
+    test()
addfile ./src/buildtest/test_dists_in_shared_directory.py
hunk ./src/buildtest/test_dists_in_shared_directory.py 1
+#!/usr/bin/env python
+
+from twisted.trial import unittest
+
+class T(unittest.TestCase):
+    def test_version(self):
+        import pkg_resources
+        pkg_resources.require('pycryptopp >= 0.5.14')
+
+        import zfec
+        import pycryptopp
+        # If you tried to import 0.5.13 then you would have gotten an
+        # exception and stopped before you reached this line.  If
+        # there is already a pycryptopp installed in the system then
+        # the import might have gotten that, instead of the fake
+        # 99.0.0 that we intended. In that case, we can't easily tell
+        # whether we got this far because we correctly skipped over
+        # the insufficient 0.5.13 and imported the sufficient 99.0.0,
+        # or because the system-provided pycryptopp was found before
+        # the insufficient 0.5.13 was found, so this test can't draw a
+        # conclusion about whether our import machinery is working
+        # right.
+        if pycryptopp.__version__ != '99.0.0':
+            raise unittest.SkipTest("We can't tell if this worked because this system has a different version of pycryptopp already installed. See comment in misc/build_helpers/test_dists_in_shared_directory.py .")
}

Context:

[test_storage.py: fix a pyflakes unused import warning.
david-sarah@jacaranda.org**20101231220756
 Ignore-this: df08231540cb7dff9d2b038e47ab30ee
] 
[test_storage.py: leave at least 512 MiB free when running test_large_share. refs #1195
david-sarah@jacaranda.org**20101231203215
 Ignore-this: b2144c0341c3452b5d4ba219e284ea0e
] 
[storage: use fileutil's version of get_disk_stats() and get_available_space(), use mockery/fakery in tests, enable large share test on platforms with sparse files and if > 4 GiB of disk space is currently available
zooko@zooko.com**20100910173629
 Ignore-this: 1304f1164c661de6d5304f993eb9b27b
] 
[fileutil: copy in the get_disk_stats() and get_available_space() functions from storage/server.py
zooko@zooko.com**20100910173520
 Ignore-this: 8b15569715f710f4fc5092f7ca109253
] 
[Update foolscap version requirement to 0.6.0, to address http://foolscap.lothar.com/trac/ticket/167
david-sarah@jacaranda.org**20101231060039
 Ignore-this: 98d2b8086a1a500b9f4565bca5a3810
] 
[docs/webapi.rst: typos.
david-sarah@jacaranda.org**20101230034422
 Ignore-this: d1f5166d72cc711f7e0d9981eac9105e
] 
[docs/webapi.rst: capitalization, formatting of section on URL character encoding, and a correction about Internet Explorer.
david-sarah@jacaranda.org**20101230034049
 Ignore-this: b3b9819d2fb264b4cdc5c8afd4e8c48d
] 
[docs: corrections and clarifications.
david-sarah@jacaranda.org**20101227051056
 Ignore-this: e33202858c7644c58f3f924b164294b6
] 
[docs: more formatting cleanups and corrections. Spell webapi and wapi as web-API.
david-sarah@jacaranda.org**20101227050533
 Ignore-this: 18b23cbfb780df585d8a722a1ec63e94
] 
[docs/debian.rst: bring description of building dependencies from source up-to-date, and change hostname from allmydata.com to tahoe-lafs.org.
david-sarah@jacaranda.org**20101212222912
 Ignore-this: f38462afc88b4475195610385a28391c
] 
[docs/architecture.rst: correct rst syntax.
david-sarah@jacaranda.org**20101212202003
 Ignore-this: 3fbe12feb28bec6f1c63aedbc79aad21
] 
[docs/architecture.rst: formatting.
david-sarah@jacaranda.org**20101212201719
 Ignore-this: 305fa5dfc2939355eaf6d0d2161eb1ff
] 
[docs: linkification, wording improvements.
david-sarah@jacaranda.org**20101212201234
 Ignore-this: 4e67287f527a8bc728cfbd93255d2aae
] 
[docs: formatting.
david-sarah@jacaranda.org**20101212201115
 Ignore-this: 2e0ed394ac7726651d3a4f2c4b0d3798
] 
[docs/configuration.rst: more formatting tweaks; which -> that.
david-sarah@jacaranda.org**20101212195522
 Ignore-this: a7becb7021854ca5a90edd892b36fdd7
] 
[docs/configuration.rst: more changes to formatting.
david-sarah@jacaranda.org**20101212194511
 Ignore-this: 491aac33e5f5268d224359f1447d10be
] 
[docs/configuration.rst: changes to formatting (mainly putting commands and filenames in monospace).
david-sarah@jacaranda.org**20101212181828
 Ignore-this: 8a1480e2d5f43bee678476424615b50f
] 
[scripts/backupdb.py: more accurate comment about path field.
david-sarah@jacaranda.org**20101212170320
 Ignore-this: 50e47a2228a85207bbcd188a78a0d4e6
] 
[scripts/cli.py: fix missing 'put' in usage example for 'tahoe put'.
david-sarah@jacaranda.org**20101212170207
 Ignore-this: 2cbadf066fff611fc03d3c0ff97ce6ec
] 
[docs/frontends/CLI.rst: changes to formatting (mainly putting commands and filenames in monospace), and to command syntax to reflect that DIRCAP/... is accepted. Clarify the syntax of 'tahoe put' and other minor corrections. Tahoe -> Tahoe-LAFS.
david-sarah@jacaranda.org**20101212165800
 Ignore-this: a123ef6b564aa8624d1e79c97068ea12
] 
[docs/frontends/CLI.rst: Unicode arguments to 'tahoe' work on Windows as of v1.7.1.
david-sarah@jacaranda.org**20101212063740
 Ignore-this: 3977a99dfa86ac33a44171deaf43aaab
] 
[docs/known_issues.rst: fix title and linkify another URL. refs #1225
david-sarah@jacaranda.org**20101212062817
 Ignore-this: cc91287f7fb51c23440b3d2fe79c449c
] 
[docs/known_issues.rst: fix an external link. refs #1225
david-sarah@jacaranda.org**20101212062435
 Ignore-this: b8cbf12f353131756c358965c48060ec
] 
[Fix a link from uri.rst to dirnodes.rst. refs #1225
david-sarah@jacaranda.org**20101212054502
 Ignore-this: af6205299f5c9a33229cab259c00f9d5
] 
[Fix a link from webapi.rst to FTP-and-SFTP.rst. refs #1225
david-sarah@jacaranda.org**20101212053435
 Ignore-this: 2b9f88678c3447ea860d6b61e8799858
] 
[More specific hyperlink to architecture.rst from helper.rst. refs #1225
david-sarah@jacaranda.org**20101212052607
 Ignore-this: 50424c768fca481252fabf58424852dc
] 
[Update hyperlinks between docs, and linkify some external references. refs #1225
david-sarah@jacaranda.org**20101212051459
 Ignore-this: cd43a4c3d3de1f832abfa88d5fc4ace1
] 
[docs/specifications/dirnodes.rst: fix references to mutable.rst. refs #1225
david-sarah@jacaranda.org**20101212012720
 Ignore-this: 6819b4b4e06e947ee48b365e840db37d
] 
[docs/specifications/mutable.rst: correct the magic string for v1 mutable containers. refs #1225
david-sarah@jacaranda.org**20101212011400
 Ignore-this: 99a5fcdd40cef83dbb08f323f6cdaaca
] 
[Move .txt files in docs/frontends and docs/specifications to .rst. refs #1225
david-sarah@jacaranda.org**20101212010251
 Ignore-this: 8796d35d928370f7dc6ad2dafdc1c0fe
] 
[Convert docs/frontends and docs/specifications to reStructuredText format (not including file moves).
david-sarah@jacaranda.org**20101212004632
 Ignore-this: e3ceb2d832d73875abe48624ddbb5622
] 
[scripts/cli.py: remove the disclaimer in the help for 'tahoe cp' that it does not handle non-ASCII filenames well. (At least, we intend to handle them.)
david-sarah@jacaranda.org**20101130002145
 Ignore-this: 94c003efaa20b9eb4a83503d79844ca
] 
[relnotes.txt: fifth -> sixth labor-of-love release
zooko@zooko.com**20101129045647
 Ignore-this: 21c245015268b38916e3a138d256c09d
] 
[Makefile: BB_BRANCH is set to the empty string for trunk, not the string 'trunk'.
david-sarah@jacaranda.org**20101128233512
 Ignore-this: 5a7ef8eb10475636d21b91e25b56c369
] 
[relnotes.txt: eleventh -> twelfth release.
david-sarah@jacaranda.org**20101128223321
 Ignore-this: 1e26410156a665271c1170803dea2c0d
] 
[relnotes.tst: point to known_issues.rst, not known_issues.txt.
david-sarah@jacaranda.org**20101128222918
 Ignore-this: 60194eb4544cac446fe4f60b3e34b887
] 
[quickstart.html: fix link to point to allmydata-tahoe-1.8.1.zip.
david-sarah@jacaranda.org**20101128221728
 Ignore-this: 7b3ee86f8256aa12f5d862f689f3ee29
] 
[TAG allmydata-tahoe-1.8.1
david-sarah@jacaranda.org**20101128212336
 Ignore-this: 9c18bdeaef4822f590d2a0d879e00621
] 
Patch bundle hash:
eef4a269fe41d540ae877395ecc3d94332744d89