Ticket #531: shouldFail-darcspatch.txt

File shouldFail-darcspatch.txt, 6.3 KB (added by davidsarah, at 2010-05-12T06:21:38Z)

Change shouldFail to avoid Unicode errors when converting Failure to str. (This patch is included in sftp-all-darcspatch.txt but is easier to review as a separate file.)

Line 
1Wed May 12 07:07:54 GMT Daylight Time 2010  david-sarah@jacaranda.org
2  * Change shouldFail to avoid Unicode errors when converting Failure to str
3
4New patches:
5
6[Change shouldFail to avoid Unicode errors when converting Failure to str
7david-sarah@jacaranda.org**20100512060754
8 Ignore-this: 86ed419d332d9c33090aae2cde1dc5df
9] {
10hunk ./src/allmydata/test/common.py 1090
11         error message, if any, because Deferred chains frequently make it
12         difficult to tell which assertion was tripped.
13 
14-        The substring= argument, if not None, must appear inside the
15-        stringified Failure, or the test will fail.
16+        The substring= argument, if not None, must appear in the 'repr'
17+        of the message wrapped by this Failure, or the test will fail.
18         """
19 
20         assert substring is None or isinstance(substring, str)
21hunk ./src/allmydata/test/common.py 1100
22             if isinstance(res, failure.Failure):
23                 res.trap(expected_failure)
24                 if substring:
25-                    self.failUnless(substring in str(res),
26+                    message = repr(res.value.args[0])
27+                    self.failUnless(substring in message,
28                                     "substring '%s' not in '%s'"
29hunk ./src/allmydata/test/common.py 1103
30-                                    % (substring, str(res)))
31+                                    % (substring, message))
32             else:
33                 self.fail("%s was supposed to raise %s, not get '%s'" %
34                           (which, expected_failure, res))
35}
36
37Context:
38
39[Clarify quickstart instructions for installing pywin32
40david-sarah@jacaranda.org**20100511180300
41 Ignore-this: d4668359673600d2acbc7cd8dd44b93c
42]
43[web: add a simple test that you can load directory.xhtml
44zooko@zooko.com**20100510063729
45 Ignore-this: e49b25fa3c67b3c7a56c8b1ae01bb463
46]
47[setup: fix typos in misc/show-tool-versions.py
48zooko@zooko.com**20100510063615
49 Ignore-this: 2181b1303a0e288e7a9ebd4c4855628
50]
51[setup: show code-coverage tool versions in show-tools-versions.py
52zooko@zooko.com**20100510062955
53 Ignore-this: 4b4c68eb3780b762c8dbbd22b39df7cf
54]
55[docs: update README, mv it to README.txt, update setup.py
56zooko@zooko.com**20100504094340
57 Ignore-this: 40e28ca36c299ea1fd12d3b91e5b421c
58]
59[tests: pass z to tar so that BSD tar will know to ungzip
60zooko@zooko.com**20100504090628
61 Ignore-this: 1339e493f255e8fc0b01b70478f23a09
62]
63[setup: update comments and URLs in setup.cfg
64zooko@zooko.com**20100504061653
65 Ignore-this: f97692807c74bcab56d33100c899f829
66]
67[setup: reorder and extend the show-tool-versions script, the better to glean information about our new buildslaves
68zooko@zooko.com**20100504045643
69 Ignore-this: 836084b56b8d4ee8f1de1f4efb706d36
70]
71[Dependency on Windmill test framework is not needed yet.
72david-sarah@jacaranda.org**20100504161043
73 Ignore-this: be088712bec650d4ef24766c0026ebc8
74]
75[CLI: Support for https url in option --node-url
76Francois Deppierraz <francois@ctrlaltdel.ch>**20100430185609
77 Ignore-this: 1717176b4d27c877e6bc67a944d9bf34
78 
79 This patch modifies the regular expression used for verifying of '--node-url'
80 parameter.  Support for accessing a Tahoe gateway over HTTPS was already
81 present, thanks to Python's urllib.
82 
83]
84[backupdb.did_create_directory: use REPLACE INTO, not INSERT INTO + ignore error
85Brian Warner <warner@lothar.com>**20100428050803
86 Ignore-this: 1fca7b8f364a21ae413be8767161e32f
87 
88 This handles the case where we upload a new tahoe directory for a
89 previously-processed local directory, possibly creating a new dircap (if the
90 metadata had changed). Now we replace the old dirhash->dircap record. The
91 previous behavior left the old record in place (with the old dircap and
92 timestamps), so we'd never stop creating new directories and never converge
93 on a null backup.
94]
95["tahoe webopen": add --info flag, to get ?t=info
96Brian Warner <warner@lothar.com>**20100424233003
97 Ignore-this: 126b0bb6db340fabacb623d295eb45fa
98 
99 Also fix some trailing whitespace.
100]
101[docs: install.html http-equiv refresh to quickstart.html
102zooko@zooko.com**20100421165708
103 Ignore-this: 52b4b619f9dde5886ae2cd7f1f3b734b
104]
105[docs: install.html -> quickstart.html
106zooko@zooko.com**20100421155757
107 Ignore-this: 6084e203909306bed93efb09d0e6181d
108 It is not called "installing" because that implies that it is going to change the configuration of your operating system. It is not called "building" because that implies that you need developer tools like a compiler. Also I added a stern warning against looking at the "InstallDetails" wiki page, which I have renamed to "AdvancedInstall".
109]
110[Fix another typo in tahoe_storagespace munin plugin
111david-sarah@jacaranda.org**20100416220935
112 Ignore-this: ad1f7aa66b554174f91dfb2b7a3ea5f3
113]
114[licensing: phrase the OpenSSL-exemption in the vocabulary of copyright instead of computer technology, and replicate the exemption from the GPL to the TGPPL
115zooko@zooko.com**20100414232521
116 Ignore-this: a5494b2f582a295544c6cad3f245e91
117]
118[munin-tahoe_storagespace
119freestorm77@gmail.com**20100221203626
120 Ignore-this: 14d6d6a587afe1f8883152bf2e46b4aa
121 
122 Plugin configuration rename
123 
124]
125[Add dependency on windmill >= 1.3
126david-sarah@jacaranda.org**20100416190404
127 Ignore-this: 4437a7a464e92d6c9012926b18676211
128]
129[setup: add licensing declaration for setuptools (noticed by the FSF compliance folks)
130zooko@zooko.com**20100309184415
131 Ignore-this: 2dfa7d812d65fec7c72ddbf0de609ccb
132]
133[setup: fix error in licensing declaration from Shawn Willden, as noted by the FSF compliance division
134zooko@zooko.com**20100309163736
135 Ignore-this: c0623d27e469799d86cabf67921a13f8
136]
137[CREDITS to Jacob Appelbaum
138zooko@zooko.com**20100304015616
139 Ignore-this: 70db493abbc23968fcc8db93f386ea54
140]
141[desert-island-build-with-proper-versions
142jacob@appelbaum.net**20100304013858]
143[docs: a few small edits to try to guide newcomers through the docs
144zooko@zooko.com**20100303231902
145 Ignore-this: a6aab44f5bf5ad97ea73e6976bc4042d
146 These edits were suggested by my watching over Jake Appelbaum's shoulder as he completely ignored/skipped/missed install.html and also as he decided that debian.txt wouldn't help him with basic installation. Then I threw in a few docs edits that have been sitting around in my sandbox asking to be committed for months.
147]
148[TAG allmydata-tahoe-1.6.1
149david-sarah@jacaranda.org**20100228062314
150 Ignore-this: eb5f03ada8ea953ee7780e7fe068539
151]
152Patch bundle hash:
1538290df2bc237af90149054a1e970c95cec178488