Ticket #1442: fix-1442-and-1446-version2.darcs.patch

File fix-1442-and-1446-version2.darcs.patch, 25.0 KB (added by davidsarah, at 2011-07-27T15:26:36Z)

SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. fixes #1442. Also includes the patch for #1446.

Line 
12 patches for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:
2
3Tue Jul 26 22:04:29 BST 2011  david-sarah@jacaranda.org
4  * SFTP: Make the lines of the shell session error and the df output end in CRLF. fixes #1446
5
6Wed Jul 27 15:22:33 BST 2011  david-sarah@jacaranda.org
7  * SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. fixes #1442
8
9New patches:
10
11[SFTP: Make the lines of the shell session error and the df output end in CRLF. fixes #1446
12david-sarah@jacaranda.org**20110726210429
13 Ignore-this: f4d194f417f044bf3df1664c14860d9b
14] {
15hunk ./src/allmydata/frontends/sftpd.py 1872
16             protocol.transport = FakeTransport()  # work around Twisted bug
17 
18         d = defer.succeed(None)
19-        d.addCallback(lambda ign: protocol.write("This server supports only SFTP, not shell sessions.\n"))
20+        d.addCallback(lambda ign: protocol.write("This server supports only SFTP, not shell sessions.\r\n"))
21         d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessTerminated(exitCode=1))))
22         return d
23 
24hunk ./src/allmydata/frontends/sftpd.py 1884
25         d = defer.succeed(None)
26         if cmd == "df -P -k /":
27             d.addCallback(lambda ign: protocol.write(
28-                          "Filesystem         1024-blocks      Used Available Capacity Mounted on\n"
29-                          "tahoe                628318530 314159265 314159265      50% /\n"))
30+                          "Filesystem         1024-blocks      Used Available Capacity Mounted on\r\n"
31+                          "tahoe                628318530 314159265 314159265      50% /\r\n"))
32             d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessDone(None))))
33         else:
34             d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessTerminated(exitCode=1))))
35hunk ./src/allmydata/test/test_sftp.py 1348
36             protocol = FakeProtocol()
37             d2 = session.execCommand(protocol, "df -P -k /")
38             d2.addCallback(lambda ign: self.failUnlessIn("1024-blocks", protocol.output))
39+            d2.addCallback(lambda ign: self.failUnlessIn("\r", protocol.output))
40             d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessDone)))
41             d2.addCallback(lambda ign: session.eofReceived())
42             d2.addCallback(lambda ign: session.closed())
43hunk ./src/allmydata/test/test_sftp.py 1372
44             protocol = FakeProtocol()
45             d2 = session.openShell(protocol)
46             d2.addCallback(lambda ign: self.failUnlessIn("only SFTP", protocol.output))
47+            d2.addCallback(lambda ign: self.failUnlessIn("\r", protocol.output))
48             d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessTerminated)))
49             d2.addCallback(lambda ign: self.failUnlessEqual(protocol.reason.value.exitCode, 1))
50             d2.addCallback(lambda ign: session.closed())
51}
52[SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. fixes #1442
53david-sarah@jacaranda.org**20110727142233
54 Ignore-this: 1c944e42b324bc48eed32e951806a1d6
55] {
56hunk ./src/allmydata/frontends/sftpd.py 1871
57         if hasattr(protocol, 'transport') and protocol.transport is None:
58             protocol.transport = FakeTransport()  # work around Twisted bug
59 
60-        d = defer.succeed(None)
61-        d.addCallback(lambda ign: protocol.write("This server supports only SFTP, not shell sessions.\r\n"))
62-        d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessTerminated(exitCode=1))))
63-        return d
64+        return self._unsupported(protocol)
65 
66     def execCommand(self, protocol, cmd):
67         self.log(".execCommand(%r, %r)" % (protocol, cmd), level=OPERATIONAL)
68hunk ./src/allmydata/frontends/sftpd.py 1885
69                           "tahoe                628318530 314159265 314159265      50% /\r\n"))
70             d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessDone(None))))
71         else:
72-            d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessTerminated(exitCode=1))))
73+            d.addCallback(lambda ign: self._unsupported(protocol))
74+        return d
75+
76+    def _unsupported(self, protocol):
77+        d = defer.succeed(None)
78+        d.addCallback(lambda ign: protocol.errReceived(
79+                      "This server supports only the SFTP protocol.\r\n"
80+                      "It does not support SCP, interactive shell sessions, or commands other than 'df'.\r\n"))
81+        d.addCallback(lambda ign: protocol.processEnded(Reason(ProcessTerminated(exitCode=1))))
82         return d
83 
84     def windowChanged(self, newWindowSize):
85hunk ./src/allmydata/test/test_sftp.py 1330
86         return d
87 
88     def test_execCommand_and_openShell(self):
89-        class FakeProtocol:
90+        class MockProtocol:
91             def __init__(self):
92                 self.output = ""
93hunk ./src/allmydata/test/test_sftp.py 1333
94+                self.error = ""
95                 self.reason = None
96hunk ./src/allmydata/test/test_sftp.py 1335
97+
98             def write(self, data):
99hunk ./src/allmydata/test/test_sftp.py 1337
100+                return self.outReceived(data)
101+
102+            def outReceived(self, data):
103                 self.output += data
104                 return defer.succeed(None)
105hunk ./src/allmydata/test/test_sftp.py 1342
106+
107+            def errReceived(self, data):
108+                self.error += data
109+                return defer.succeed(None)
110+
111             def processEnded(self, reason):
112                 self.reason = reason
113                 return defer.succeed(None)
114hunk ./src/allmydata/test/test_sftp.py 1355
115 
116         d.addCallback(lambda ign: conch_interfaces.ISession(self.handler))
117         def _exec_df(session):
118-            protocol = FakeProtocol()
119+            protocol = MockProtocol()
120             d2 = session.execCommand(protocol, "df -P -k /")
121             d2.addCallback(lambda ign: self.failUnlessIn("1024-blocks", protocol.output))
122             d2.addCallback(lambda ign: self.failUnlessIn("\r", protocol.output))
123hunk ./src/allmydata/test/test_sftp.py 1359
124+            d2.addCallback(lambda ign: self.failUnlessEqual(protocol.error, ""))
125             d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessDone)))
126             d2.addCallback(lambda ign: session.eofReceived())
127             d2.addCallback(lambda ign: session.closed())
128hunk ./src/allmydata/test/test_sftp.py 1366
129             return d2
130         d.addCallback(_exec_df)
131 
132+        def _check_unsupported(protocol):
133+            d2 = defer.succeed(None)
134+            d2.addCallback(lambda ign: self.failUnlessEqual(protocol.output, ""))
135+            d2.addCallback(lambda ign: self.failUnlessIn("only the SFTP protocol", protocol.error))
136+            d2.addCallback(lambda ign: self.failUnlessIn("\r", protocol.error))
137+            d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessTerminated)))
138+            d2.addCallback(lambda ign: self.failUnlessEqual(protocol.reason.value.exitCode, 1))
139+            return d2
140+
141         d.addCallback(lambda ign: conch_interfaces.ISession(self.handler))
142         def _exec_error(session):
143hunk ./src/allmydata/test/test_sftp.py 1377
144-            protocol = FakeProtocol()
145+            protocol = MockProtocol()
146             d2 = session.execCommand(protocol, "error")
147             d2.addCallback(lambda ign: session.windowChanged(None))
148hunk ./src/allmydata/test/test_sftp.py 1380
149-            d2.addCallback(lambda ign: self.failUnlessEqual("", protocol.output))
150-            d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessTerminated)))
151-            d2.addCallback(lambda ign: self.failUnlessEqual(protocol.reason.value.exitCode, 1))
152+            d2.addCallback(lambda ign: _check_unsupported(protocol))
153             d2.addCallback(lambda ign: session.closed())
154             return d2
155         d.addCallback(_exec_error)
156hunk ./src/allmydata/test/test_sftp.py 1387
157 
158         d.addCallback(lambda ign: conch_interfaces.ISession(self.handler))
159         def _openShell(session):
160-            protocol = FakeProtocol()
161+            protocol = MockProtocol()
162             d2 = session.openShell(protocol)
163hunk ./src/allmydata/test/test_sftp.py 1389
164-            d2.addCallback(lambda ign: self.failUnlessIn("only SFTP", protocol.output))
165-            d2.addCallback(lambda ign: self.failUnlessIn("\r", protocol.output))
166-            d2.addCallback(lambda ign: self.failUnless(isinstance(protocol.reason.value, ProcessTerminated)))
167-            d2.addCallback(lambda ign: self.failUnlessEqual(protocol.reason.value.exitCode, 1))
168+            d2.addCallback(lambda ign: _check_unsupported(protocol))
169             d2.addCallback(lambda ign: session.closed())
170             return d2
171         d.addCallback(_openShell)
172}
173
174Context:
175
176[docs/man/tahoe.1: add man page. fixes #1420
177david-sarah@jacaranda.org**20110724171728
178 Ignore-this: fc7601ec7f25494288d6141d0ae0004c
179]
180[misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334
181david-sarah@jacaranda.org**20110722035402
182 Ignore-this: 5d03f544c4154f088e26c7107494bf39
183]
184[misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334
185david-sarah@jacaranda.org**20110722024907
186 Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c
187]
188[frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it.
189david-sarah@jacaranda.org**20110722000320
190 Ignore-this: 55cd558b791526113db3f83c00ec328a
191]
192[Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435
193david-sarah@jacaranda.org**20110721234941
194 Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9
195]
196[Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429
197david-sarah@jacaranda.org**20110721233658
198 Ignore-this: 81b41745477163c9b39c0b59db91cc62
199]
200[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
201david-sarah@jacaranda.org**20110718005949
202 Ignore-this: 81837fbce073e93d88a3e7ae3122458c
203]
204[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
205david-sarah@jacaranda.org**20110717194315
206 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
207]
208[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
209zooko@zooko.com**20110717114226
210 Ignore-this: df222120d41447ce4102616921626c82
211 fixes #1383
212]
213[docs: add missing link in NEWS.rst
214zooko@zooko.com**20110712153307
215 Ignore-this: be7b7eb81c03700b739daa1027d72b35
216]
217[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
218zooko@zooko.com**20110712153229
219 Ignore-this: 723c4f9e2211027c79d711715d972c5
220 Also remove a couple of vestigial references to figleaf, which is long gone.
221 fixes #1409 (remove contrib/fuse)
222]
223[README.txt: say that quickstart.rst is in the docs directory.
224david-sarah@jacaranda.org**20110717192400
225 Ignore-this: bc6d35a85c496b77dbef7570677ea42a
226]
227[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
228david-sarah@jacaranda.org**20110716181813
229 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
230]
231[add Protovis.js-based download-status timeline visualization
232Brian Warner <warner@lothar.com>**20110629222606
233 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
234 
235 provide status overlap info on the webapi t=json output, add decode/decrypt
236 rate tooltips, add zoomin/zoomout buttons
237]
238[add more download-status data, fix tests
239Brian Warner <warner@lothar.com>**20110629222555
240 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
241]
242[prepare for viz: improve DownloadStatus events
243Brian Warner <warner@lothar.com>**20110629222542
244 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
245 
246 consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
247]
248[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
249zooko@zooko.com**20110629185711
250 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
251]
252[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
253david-sarah@jacaranda.org**20110130235809
254 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
255]
256[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
257david-sarah@jacaranda.org**20110626054124
258 Ignore-this: abb864427a1b91bd10d5132b4589fd90
259]
260[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
261david-sarah@jacaranda.org**20110623205528
262 Ignore-this: c63e23146c39195de52fb17c7c49b2da
263]
264[Rename test_package_initialization.py to (much shorter) test_import.py .
265Brian Warner <warner@lothar.com>**20110611190234
266 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
267 
268 The former name was making my 'ls' listings hard to read, by forcing them
269 down to just two columns.
270]
271[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
272zooko@zooko.com**20110611163741
273 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
274 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
275 fixes #1412
276]
277[wui: right-align the size column in the WUI
278zooko@zooko.com**20110611153758
279 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
280 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
281 fixes #1412
282]
283[docs: three minor fixes
284zooko@zooko.com**20110610121656
285 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
286 CREDITS for arc for stats tweak
287 fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
288 English usage tweak
289]
290[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
291david-sarah@jacaranda.org**20110609223719
292 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
293]
294[server.py:  get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
295wilcoxjg@gmail.com**20110527120135
296 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
297 interfaces.py:  modified the return type of RIStatsProvider.get_stats to allow for None as a return value
298 NEWS.rst, stats.py: documentation of change to get_latencies
299 stats.rst: now documents percentile modification in get_latencies
300 test_storage.py:  test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
301 fixes #1392
302]
303[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
304david-sarah@jacaranda.org**20110517011214
305 Ignore-this: 6a5be6e70241e3ec0575641f64343df7
306]
307[docs: convert NEWS to NEWS.rst and change all references to it.
308david-sarah@jacaranda.org**20110517010255
309 Ignore-this: a820b93ea10577c77e9c8206dbfe770d
310]
311[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
312david-sarah@jacaranda.org**20110512140559
313 Ignore-this: 784548fc5367fac5450df1c46890876d
314]
315[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
316david-sarah@jacaranda.org**20110130164923
317 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
318]
319[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
320zooko@zooko.com**20110128142006
321 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
322 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
323]
324[M-x whitespace-cleanup
325zooko@zooko.com**20110510193653
326 Ignore-this: dea02f831298c0f65ad096960e7df5c7
327]
328[docs: fix typo in running.rst, thanks to arch_o_median
329zooko@zooko.com**20110510193633
330 Ignore-this: ca06de166a46abbc61140513918e79e8
331]
332[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
333david-sarah@jacaranda.org**20110204204902
334 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
335]
336[relnotes.txt: forseeable -> foreseeable. refs #1342
337david-sarah@jacaranda.org**20110204204116
338 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
339]
340[replace remaining .html docs with .rst docs
341zooko@zooko.com**20110510191650
342 Ignore-this: d557d960a986d4ac8216d1677d236399
343 Remove install.html (long since deprecated).
344 Also replace some obsolete references to install.html with references to quickstart.rst.
345 Fix some broken internal references within docs/historical/historical_known_issues.txt.
346 Thanks to Ravi Pinjala and Patrick McDonald.
347 refs #1227
348]
349[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
350zooko@zooko.com**20110428055232
351 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
352]
353[munin tahoe_files plugin: fix incorrect file count
354francois@ctrlaltdel.ch**20110428055312
355 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
356 fixes #1391
357]
358[corrected "k must never be smaller than N" to "k must never be greater than N"
359secorp@allmydata.org**20110425010308
360 Ignore-this: 233129505d6c70860087f22541805eac
361]
362[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
363david-sarah@jacaranda.org**20110411190738
364 Ignore-this: 7847d26bc117c328c679f08a7baee519
365]
366[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
367david-sarah@jacaranda.org**20110410155844
368 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
369]
370[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
371david-sarah@jacaranda.org**20110410155705
372 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
373]
374[remove unused variable detected by pyflakes
375zooko@zooko.com**20110407172231
376 Ignore-this: 7344652d5e0720af822070d91f03daf9
377]
378[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
379david-sarah@jacaranda.org**20110401202750
380 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
381]
382[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
383Brian Warner <warner@lothar.com>**20110325232511
384 Ignore-this: d5307faa6900f143193bfbe14e0f01a
385]
386[control.py: remove all uses of s.get_serverid()
387warner@lothar.com**20110227011203
388 Ignore-this: f80a787953bd7fa3d40e828bde00e855
389]
390[web: remove some uses of s.get_serverid(), not all
391warner@lothar.com**20110227011159
392 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
393]
394[immutable/downloader/fetcher.py: remove all get_serverid() calls
395warner@lothar.com**20110227011156
396 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
397]
398[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
399warner@lothar.com**20110227011153
400 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
401 
402 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
403 _shares_from_server dict was being popped incorrectly (using shnum as the
404 index instead of serverid). I'm still thinking through the consequences of
405 this bug. It was probably benign and really hard to detect. I think it would
406 cause us to incorrectly believe that we're pulling too many shares from a
407 server, and thus prefer a different server rather than asking for a second
408 share from the first server. The diversity code is intended to spread out the
409 number of shares simultaneously being requested from each server, but with
410 this bug, it might be spreading out the total number of shares requested at
411 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
412 segment, so the effect doesn't last very long).
413]
414[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
415warner@lothar.com**20110227011150
416 Ignore-this: d8d56dd8e7b280792b40105e13664554
417 
418 test_download.py: create+check MyShare instances better, make sure they share
419 Server objects, now that finder.py cares
420]
421[immutable/downloader/finder.py: reduce use of get_serverid(), one left
422warner@lothar.com**20110227011146
423 Ignore-this: 5785be173b491ae8a78faf5142892020
424]
425[immutable/offloaded.py: reduce use of get_serverid() a bit more
426warner@lothar.com**20110227011142
427 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
428]
429[immutable/upload.py: reduce use of get_serverid()
430warner@lothar.com**20110227011138
431 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
432]
433[immutable/checker.py: remove some uses of s.get_serverid(), not all
434warner@lothar.com**20110227011134
435 Ignore-this: e480a37efa9e94e8016d826c492f626e
436]
437[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
438warner@lothar.com**20110227011132
439 Ignore-this: 6078279ddf42b179996a4b53bee8c421
440 MockIServer stubs
441]
442[upload.py: rearrange _make_trackers a bit, no behavior changes
443warner@lothar.com**20110227011128
444 Ignore-this: 296d4819e2af452b107177aef6ebb40f
445]
446[happinessutil.py: finally rename merge_peers to merge_servers
447warner@lothar.com**20110227011124
448 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
449]
450[test_upload.py: factor out FakeServerTracker
451warner@lothar.com**20110227011120
452 Ignore-this: 6c182cba90e908221099472cc159325b
453]
454[test_upload.py: server-vs-tracker cleanup
455warner@lothar.com**20110227011115
456 Ignore-this: 2915133be1a3ba456e8603885437e03
457]
458[happinessutil.py: server-vs-tracker cleanup
459warner@lothar.com**20110227011111
460 Ignore-this: b856c84033562d7d718cae7cb01085a9
461]
462[upload.py: more tracker-vs-server cleanup
463warner@lothar.com**20110227011107
464 Ignore-this: bb75ed2afef55e47c085b35def2de315
465]
466[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
467warner@lothar.com**20110227011103
468 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
469]
470[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
471warner@lothar.com**20110227011100
472 Ignore-this: 7ea858755cbe5896ac212a925840fe68
473 
474 No behavioral changes, just updating variable/method names and log messages.
475 The effects outside these three files should be minimal: some exception
476 messages changed (to say "server" instead of "peer"), and some internal class
477 names were changed. A few things still use "peer" to minimize external
478 changes, like UploadResults.timings["peer_selection"] and
479 happinessutil.merge_peers, which can be changed later.
480]
481[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
482warner@lothar.com**20110227011056
483 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
484]
485[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
486warner@lothar.com**20110227011051
487 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
488]
489[test: increase timeout on a network test because Francois's ARM machine hit that timeout
490zooko@zooko.com**20110317165909
491 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
492 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
493]
494[docs/configuration.rst: add a "Frontend Configuration" section
495Brian Warner <warner@lothar.com>**20110222014323
496 Ignore-this: 657018aa501fe4f0efef9851628444ca
497 
498 this points to docs/frontends/*.rst, which were previously underlinked
499]
500[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
501"Brian Warner <warner@lothar.com>"**20110221061544
502 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
503]
504[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
505david-sarah@jacaranda.org**20110221015817
506 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
507]
508[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
509david-sarah@jacaranda.org**20110221020125
510 Ignore-this: b0744ed58f161bf188e037bad077fc48
511]
512[Refactor StorageFarmBroker handling of servers
513Brian Warner <warner@lothar.com>**20110221015804
514 Ignore-this: 842144ed92f5717699b8f580eab32a51
515 
516 Pass around IServer instance instead of (peerid, rref) tuple. Replace
517 "descriptor" with "server". Other replacements:
518 
519  get_all_servers -> get_connected_servers/get_known_servers
520  get_servers_for_index -> get_servers_for_psi (now returns IServers)
521 
522 This change still needs to be pushed further down: lots of code is now
523 getting the IServer and then distributing (peerid, rref) internally.
524 Instead, it ought to distribute the IServer internally and delay
525 extracting a serverid or rref until the last moment.
526 
527 no_network.py was updated to retain parallelism.
528]
529[TAG allmydata-tahoe-1.8.2
530warner@lothar.com**20110131020101]
531Patch bundle hash:
53298f489c76a4438f9f559b36a959f879d0dbfc63c