From 5f592cf331d39bad4c08a285dc60a5c6208b8359 Mon Sep 17 00:00:00 2001 From: David-Sarah Hopwood Date: Tue, 5 Feb 2013 19:42:01 +0000 Subject: [PATCH] test_client.py: cleanups to S3 config tests. Signed-off-by: David-Sarah Hopwood --- src/allmydata/test/test_client.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/allmydata/test/test_client.py b/src/allmydata/test/test_client.py index 0d757454..13cf7892 100644 --- a/src/allmydata/test/test_client.py +++ b/src/allmydata/test/test_client.py @@ -197,15 +197,15 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase): "reserved_space = bogus\n") self.failUnlessRaises(InvalidValueError, client.Client, basedir) - def _write_s3secret(self, basedir, secret="dummy"): - os.mkdir(os.path.join(basedir, "private")) - fileutil.write(os.path.join(basedir, "private", "s3secret"), secret) + def _write_secret(self, basedir, filename, secret="dummy"): + fileutil.make_dirs(os.path.join(basedir, "private")) + fileutil.write(os.path.join(basedir, "private", filename), secret) @mock.patch('allmydata.storage.backends.cloud.s3.s3_container.S3Container') def test_s3_config_good_defaults(self, mock_S3Container): basedir = "client.Basic.test_s3_config_good_defaults" os.mkdir(basedir) - self._write_s3secret(basedir) + self._write_secret(basedir, "s3secret") config = (BASECONFIG + "[storage]\n" + "enabled = true\n" + @@ -220,11 +220,11 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase): self.failUnless(isinstance(server.backend, CloudBackend), server.backend) mock_S3Container.reset_mock() - fileutil.write(os.path.join(basedir, "private", "s3producttoken"), "{ProductToken}") + self._write_secret(basedir, "s3producttoken", secret="{ProductToken}") self.failUnlessRaises(InvalidValueError, client.Client, basedir) mock_S3Container.reset_mock() - fileutil.write(os.path.join(basedir, "private", "s3usertoken"), "{UserToken}") + self._write_secret(basedir, "s3usertoken", secret="{UserToken}") fileutil.write(os.path.join(basedir, "tahoe.cfg"), config + "s3.url = http://s3.example.com\n") c = client.Client(basedir) @@ -234,7 +234,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase): def test_s3_readonly_bad(self): basedir = "client.Basic.test_s3_readonly_bad" os.mkdir(basedir) - self._write_s3secret(basedir) + self._write_secret(basedir, "s3secret") fileutil.write(os.path.join(basedir, "tahoe.cfg"), BASECONFIG + "[storage]\n" + @@ -314,7 +314,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase): def test_s3_config_no_access_key_id(self): basedir = "client.Basic.test_s3_config_no_access_key_id" os.mkdir(basedir) - self._write_s3secret(basedir) + self._write_secret(basedir, "s3secret") fileutil.write(os.path.join(basedir, "tahoe.cfg"), BASECONFIG + "[storage]\n" + @@ -326,7 +326,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase): def test_s3_config_no_bucket(self): basedir = "client.Basic.test_s3_config_no_bucket" os.mkdir(basedir) - self._write_s3secret(basedir) + self._write_secret(basedir, "s3secret") fileutil.write(os.path.join(basedir, "tahoe.cfg"), BASECONFIG + "[storage]\n" + -- 2.45.2