Skip to content

Commit

Permalink
[#267] update tests for removed recursive operation 'pre-flight' output
Browse files Browse the repository at this point in the history
  • Loading branch information
SwooshyCueb authored and alanking committed Apr 26, 2024
1 parent 2fee1a5 commit 28facc4
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions packaging/test_plugin_unified_storage_tiering.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from .. import test
from .. import paths
from .. import lib
from . import ustrings

@contextlib.contextmanager
def storage_tiering_configured_custom(arg=None, sleep_time=1):
Expand Down Expand Up @@ -1418,7 +1417,7 @@ def test_put_gt_max_sql_rows(self):
try:
shutil.rmtree(dirname, ignore_errors=True)
lib.make_large_local_tmp_dir(dirname, file_count, 1)
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname], 'STDOUT_SINGLELINE', ustrings.recurse_ok_string())
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname])

# stage to tier 1, everything should have been tiered out
sleep(5)
Expand Down Expand Up @@ -1447,7 +1446,7 @@ def test_put_max_sql_rows(self):
try:
shutil.rmtree(dirname, ignore_errors=True)
lib.make_large_local_tmp_dir(dirname, file_count, 1)
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname], 'STDOUT_SINGLELINE', ustrings.recurse_ok_string())
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname])

# stage to tier 1, everything should have been tiered out
sleep(5)
Expand Down Expand Up @@ -1479,7 +1478,7 @@ def test_put_object_limit_lt(self):
last_item_path = os.path.join(dirname, 'junk0' + str(file_count - 1))
next_to_last_item_path = os.path.join(dirname, 'junk0' + str(file_count - 2))
lib.make_large_local_tmp_dir(dirname, file_count, 1)
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname], 'STDOUT_SINGLELINE', ustrings.recurse_ok_string())
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname])

# stage to tier 1, only the last item should not have been tiered out
sleep(5)
Expand Down Expand Up @@ -1512,7 +1511,7 @@ def test_put_multi_fetch_page(self):
try:
shutil.rmtree(dirname, ignore_errors=True)
lib.make_large_local_tmp_dir(dirname, file_count, 1)
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname], 'STDOUT_SINGLELINE', ustrings.recurse_ok_string())
admin_session.assert_icommand(['iput', '-R', 'ufs0', '-r', dirname])

# stage to tier 1, everything should have been tiered out
sleep(5)
Expand Down

0 comments on commit 28facc4

Please sign in to comment.