tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

test_client.py: cleanups to S3 config tests. 

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
This commit is contained in:
David-Sarah Hopwood 2013-02-05 19:42:01 +00:00 committed by Daira Hopwood
parent 0e7e3bc51e
commit 0da49ed0d7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/allmydata/test/test_client.py
View File

@ -170,15 +170,15 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
"reserved_space = bogus\n") "reserved_space = bogus\n")
self.failUnlessRaises(InvalidValueError, client.Client, basedir) self.failUnlessRaises(InvalidValueError, client.Client, basedir)
def _write_s3secret(self, basedir, secret="dummy"): def _write_secret(self, basedir, filename, secret="dummy"):
os.mkdir(os.path.join(basedir, "private")) fileutil.make_dirs(os.path.join(basedir, "private"))
fileutil.write(os.path.join(basedir, "private", "s3secret"), secret) fileutil.write(os.path.join(basedir, "private", filename), secret)
@mock.patch('allmydata.storage.backends.cloud.s3.s3_container.S3Container') @mock.patch('allmydata.storage.backends.cloud.s3.s3_container.S3Container')
def test_s3_config_good_defaults(self, mock_S3Container): def test_s3_config_good_defaults(self, mock_S3Container):
basedir = "client.Basic.test_s3_config_good_defaults" basedir = "client.Basic.test_s3_config_good_defaults"
os.mkdir(basedir) os.mkdir(basedir)
self._write_s3secret(basedir) self._write_secret(basedir, "s3secret")
config = (BASECONFIG + config = (BASECONFIG +
"[storage]\n" + "[storage]\n" +
"enabled = true\n" + "enabled = true\n" +
@ -193,11 +193,11 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
self.failUnless(isinstance(server.backend, CloudBackend), server.backend) self.failUnless(isinstance(server.backend, CloudBackend), server.backend)
mock_S3Container.reset_mock() 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) self.failUnlessRaises(InvalidValueError, client.Client, basedir)
mock_S3Container.reset_mock() 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") fileutil.write(os.path.join(basedir, "tahoe.cfg"), config + "s3.url = http://s3.example.com\n")
c = client.Client(basedir) c = client.Client(basedir)
@ -207,7 +207,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
def test_s3_readonly_bad(self): def test_s3_readonly_bad(self):
basedir = "client.Basic.test_s3_readonly_bad" basedir = "client.Basic.test_s3_readonly_bad"
os.mkdir(basedir) os.mkdir(basedir)
self._write_s3secret(basedir) self._write_secret(basedir, "s3secret")
fileutil.write(os.path.join(basedir, "tahoe.cfg"), fileutil.write(os.path.join(basedir, "tahoe.cfg"),
BASECONFIG + BASECONFIG +
"[storage]\n" + "[storage]\n" +
@ -221,7 +221,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
def test_s3_config_no_access_key_id(self): def test_s3_config_no_access_key_id(self):
basedir = "client.Basic.test_s3_config_no_access_key_id" basedir = "client.Basic.test_s3_config_no_access_key_id"
os.mkdir(basedir) os.mkdir(basedir)
self._write_s3secret(basedir) self._write_secret(basedir, "s3secret")
fileutil.write(os.path.join(basedir, "tahoe.cfg"), fileutil.write(os.path.join(basedir, "tahoe.cfg"),
BASECONFIG + BASECONFIG +
"[storage]\n" + "[storage]\n" +
@ -233,7 +233,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
def test_s3_config_no_bucket(self): def test_s3_config_no_bucket(self):
basedir = "client.Basic.test_s3_config_no_bucket" basedir = "client.Basic.test_s3_config_no_bucket"
os.mkdir(basedir) os.mkdir(basedir)
self._write_s3secret(basedir) self._write_secret(basedir, "s3secret")
fileutil.write(os.path.join(basedir, "tahoe.cfg"), fileutil.write(os.path.join(basedir, "tahoe.cfg"),
BASECONFIG + BASECONFIG +
"[storage]\n" + "[storage]\n" +