squashlater: address OS concern RE: test output order

metomi · Mar 11, 2019 · f83364b · f83364b
1 parent 8c714fe
commit f83364b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/python/rose/upgrade.py b/lib/python/rose/upgrade.py
@@ -778,6 +778,7 @@ def main():
                                                  upgrade_manager.get_name())
     new_config_map, changes_map = rose.macro.apply_macro_to_config_map(
         combined_config_map, meta_config, macro_function, macro_name=macro_id)
+    sys.stdout.flush()  # Ensure text from macro output before next fn
     has_changes = rose.macro.handle_transform(config_map, new_config_map,
                                               changes_map, macro_id,
                                               opts.conf_dir, opts.output_dir,

diff --git a/t/rose-app-upgrade/05-cwd.t b/t/rose-app-upgrade/05-cwd.t
@@ -38,12 +38,12 @@ CONFIG_DIR=$(cd ../config && pwd -P)
 run_pass "$TEST_KEY" rose app-upgrade --non-interactive \
  --meta-path=../rose-meta/ -C ../config fig
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUTPUT__
+Current directory: $CONFIG_DIR
 [U] Upgrade_apple-fig: changes: 2
     namelist:add_sect_only=None=None
         Added
     =meta=test-app-upgrade/fig
         Upgraded from apple to fig
-Current directory: $CONFIG_DIR
 __OUTPUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 teardown