From 64eec5fc93eb670e581cbb3a6dedb6a7aa501e99 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Thu, 7 Mar 2019 14:36:02 -0800 Subject: [PATCH] Fix how we UTF-8-ify func tests I noticed while poking at the DLO func tests that we don't actually use non-ascii chars when we set up the test env. By patching the create name function earlier (in SetUpClass) we can ensure we get some more interesting characters in our object names. Change-Id: I9480ddf74463310aeb11ad876b79527888d8c871 --- test/functional/tests.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/functional/tests.py b/test/functional/tests.py index e3dbc5fc10..768624b2fe 100644 --- a/test/functional/tests.py +++ b/test/functional/tests.py @@ -128,11 +128,13 @@ class Base(unittest2.TestCase): class Base2(object): - def setUp(self): + @classmethod + def setUpClass(cls): Utils.create_name = Utils.create_utf8_name - super(Base2, self).setUp() + super(Base2, cls).setUpClass() - def tearDown(self): + @classmethod + def tearDownClass(cls): Utils.create_name = Utils.create_ascii_name @@ -353,8 +355,10 @@ class TestAccount(Base): self.assertEqual(len(containers), len(self.env.containers)) self.assert_status(200) + marker = (containers[-1] if format_type is None + else containers[-1]['name']) containers = self.env.account.containers( - parms={'format': format_type, 'marker': containers[-1]}) + parms={'format': format_type, 'marker': marker}) self.assertEqual(len(containers), 0) if format_type is None: self.assert_status(204) @@ -771,8 +775,9 @@ class TestContainer(Base): self.assertEqual(len(files), len(self.env.files)) self.assert_status(200) + marker = files[-1] if format_type is None else files[-1]['name'] files = self.env.container.files( - parms={'format': format_type, 'marker': files[-1]}) + parms={'format': format_type, 'marker': marker}) self.assertEqual(len(files), 0) if format_type is None: