Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions tests/integration/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import os
import random
import re
import shutil
import signal
Expand All @@ -24,6 +23,7 @@
from awscli.testutils import (
BaseS3CLICommand,
aws,
random_bucket_name,
skip_if_windows,
temporary_file,
unittest,
Expand Down Expand Up @@ -173,9 +173,7 @@ def test_param_with_file(self):
def test_streaming_output_operation(self):
d = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, d)
bucket_name = (
'clistream' + str(int(time.time())) + str(random.randint(1, 100))
)
bucket_name = random_bucket_name('clistream')

self.put_object(
bucket=bucket_name, key='foobar', content='foobar contents'
Expand All @@ -196,9 +194,7 @@ def test_no_sign_request(self):
env_vars['AWS_ACCESS_KEY_ID'] = 'foo'
env_vars['AWS_SECRET_ACCESS_KEY'] = 'bar'

bucket_name = (
'nosign' + str(int(time.time())) + str(random.randint(1, 100))
)
bucket_name = random_bucket_name('nosign')
self.put_object(
bucket_name,
'foo',
Expand Down Expand Up @@ -229,9 +225,7 @@ def test_no_sign_request(self):
def test_no_paginate_arg(self):
d = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, d)
bucket_name = (
'nopaginate' + str(int(time.time())) + str(random.randint(1, 100))
)
bucket_name = random_bucket_name('nopaginate')

self.put_object(
bucket=bucket_name, key='foobar', content='foobar contents'
Expand Down