From aeea924c1ebed0b23097a19c163b4a87be95f576 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Jan 2019 19:24:15 -0500 Subject: [PATCH 1/4] news fragment --- newsfragments/2967.other | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2967.other diff --git a/newsfragments/2967.other b/newsfragments/2967.other new file mode 100644 index 000000000..7ee8118b3 --- /dev/null +++ b/newsfragments/2967.other @@ -0,0 +1 @@ +A bug in the test suite for the create-alias command has been fixed. From f0734284e02b8ceda8fe6e77ea8a31b597328930 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Jan 2019 19:24:20 -0500 Subject: [PATCH 2/4] whitespace --- src/allmydata/test/cli/test_create_alias.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/allmydata/test/cli/test_create_alias.py b/src/allmydata/test/cli/test_create_alias.py index 5f4b70a54..3f83b65c0 100644 --- a/src/allmydata/test/cli/test_create_alias.py +++ b/src/allmydata/test/cli/test_create_alias.py @@ -205,5 +205,3 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase): return d # TODO: test list-aliases, including Unicode - - From b54a6e811b86258438eab96058f0abd9a1420d10 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Jan 2019 19:24:28 -0500 Subject: [PATCH 3/4] Return the Deferred to make the test valid --- src/allmydata/test/cli/test_create_alias.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/allmydata/test/cli/test_create_alias.py b/src/allmydata/test/cli/test_create_alias.py index 3f83b65c0..e1efb0616 100644 --- a/src/allmydata/test/cli/test_create_alias.py +++ b/src/allmydata/test/cli/test_create_alias.py @@ -145,6 +145,7 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase): self.failUnless("un-corrupted2" in aliases) self.failUnless(aliases["un-corrupted2"].startswith("URI:DIR2:")) d.addCallback(_check_not_corrupted) + return d def test_create_unicode(self): self.basedir = "cli/CreateAlias/create_unicode" From 0f6009b97e8e4858d977d7722fd0807389d10a73 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Jan 2019 19:32:56 -0500 Subject: [PATCH 4/4] Fix the option setup for the webopen command. --- src/allmydata/test/cli/test_create_alias.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/allmydata/test/cli/test_create_alias.py b/src/allmydata/test/cli/test_create_alias.py index e1efb0616..46224de49 100644 --- a/src/allmydata/test/cli/test_create_alias.py +++ b/src/allmydata/test/cli/test_create_alias.py @@ -1,3 +1,4 @@ +from StringIO import StringIO import os.path from twisted.trial import unittest import urllib @@ -17,7 +18,10 @@ class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase): o.parseOptions(["--node-directory", self.get_clientdir(), "webopen"] + list(args)) urls = [] - rc = cli.webopen(o, urls.append) + o.subOptions.stdout = StringIO() + o.subOptions.stderr = StringIO() + o.subOptions.stdin = StringIO() + rc = cli.webopen(o.subOptions, urls.append) self.failUnlessReallyEqual(rc, 0) self.failUnlessReallyEqual(len(urls), 1) self.failUnlessReallyEqual(urls[0], expected_url)