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
11 changes: 4 additions & 7 deletions tests/integration/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
import signal
import os
import tempfile
import random
import shutil

import botocore.session
from awscli.testutils import unittest, aws, BaseS3CLICommand
from awscli.testutils import temporary_file
from awscli.testutils import skip_if_windows
from awscli.testutils import random_bucket_name
from awscli.clidriver import create_clidriver


Expand Down Expand Up @@ -159,8 +159,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 @@ -179,8 +178,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', content='bar',
extra_args={'ACL': 'public-read-write'})

Expand All @@ -203,8 +201,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