Fix minor dependencies on "allmydata-tahoe" as appname.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index 8f0ecaa646b03582b525f28be5f16615afd39ac9..6bc5fc1c614b367a90b87e91bdc3a147fe9c0526 100644 (file)
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -7,6 +7,7 @@ import simplejson
 
 from mock import patch, Mock, call
 
+import allmydata
 from allmydata.util import fileutil, hashutil, base32, keyutil
 from allmydata import uri
 from allmydata.immutable import upload
@@ -3841,7 +3842,7 @@ class Options(unittest.TestCase):
         # "tahoe --version" dumps text to stdout and exits
         stdout = StringIO()
         self.failUnlessRaises(SystemExit, self.parse, ["--version"], stdout)
-        self.failUnlessIn("allmydata-tahoe", stdout.getvalue())
+        self.failUnlessIn(allmydata.__appname__ + ":", stdout.getvalue())
         # but "tahoe SUBCOMMAND --version" should be rejected
         self.failUnlessRaises(usage.UsageError, self.parse,
                               ["start", "--version"])

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 339bb5ec036ae2e103ccfdd257314fee40735a44..3c79777f8f7df8aa1b26e6d4989f443099d23613 100644 (file)
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -149,7 +149,7 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
             out, err, rc_or_sig = res
             self.failUnlessEqual(rc_or_sig, 0, str(res))
 
-            # Fail unless the allmydata-tahoe package is *this* version *and*
+            # Fail unless the __appname__ package is *this* version *and*
             # was loaded from *this* source directory.
 
             required_verstr = str(allmydata.__version__)