1d7da740b2
Add a new module that contain generic wrapper for file and iterator, which are used to wrap image to upload and the request body iterator in upload and download cases repectively, to show and advance a pretty progress bar when this laters are consumed, The progress bar is triggered by adding a --progress command line argument to commands: image-create, image-download or image-update. Change-Id: I2ba42fd0c58f4fa087adb568ec3f08246cae3759 bug fix: LP#1112309 blueprint: progressbar-when-uploading
60 lines
2.0 KiB
Python
60 lines
2.0 KiB
Python
# Copyright 2013 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import sys
|
|
import StringIO
|
|
|
|
import testtools
|
|
|
|
from glanceclient.common import progressbar
|
|
from tests import utils as test_utils
|
|
|
|
|
|
class TestProgressBarWrapper(testtools.TestCase):
|
|
|
|
def test_iter_iterator_display_progress_bar(self):
|
|
size = 100
|
|
iterator = iter('X' * 100)
|
|
saved_stdout = sys.stdout
|
|
try:
|
|
sys.stdout = output = test_utils.FakeTTYStdout()
|
|
# Consume iterator.
|
|
data = list(progressbar.VerboseIteratorWrapper(iterator, size))
|
|
self.assertEqual(data, ['X'] * 100)
|
|
self.assertEqual(
|
|
output.getvalue().strip(),
|
|
'[%s>] 100%%' % ('=' * 29)
|
|
)
|
|
finally:
|
|
sys.stdout = saved_stdout
|
|
|
|
def test_iter_file_display_progress_bar(self):
|
|
size = 98304
|
|
file_obj = StringIO.StringIO('X' * size)
|
|
saved_stdout = sys.stdout
|
|
try:
|
|
sys.stdout = output = test_utils.FakeTTYStdout()
|
|
file_obj = progressbar.VerboseFileWrapper(file_obj, size)
|
|
chunksize = 1024
|
|
chunk = file_obj.read(chunksize)
|
|
while chunk:
|
|
chunk = file_obj.read(chunksize)
|
|
self.assertEqual(
|
|
output.getvalue().strip(),
|
|
'[%s>] 100%%' % ('=' * 29)
|
|
)
|
|
finally:
|
|
sys.stdout = saved_stdout
|