@@ -34,16 +34,16 @@ def test_teuthology_logs(num_runs:int,num_jobs:int,selection:int, flag_set:bool,
3434 logger = logging .getLogger (__name__ )
3535
3636 if flag_set :
37- monkeypatch .setattr (sys , 'argv' , [ sys .argv [0 ],'-c' , 'ceph_devstack/resources/test/test_config.yaml ' , 'logs' ,'--log-file' ])
37+ monkeypatch .setattr (sys , 'argv' , [ sys .argv [0 ],'-c' , 'ceph_devstack/resources/test/test_config.toml ' , 'logs' ,'--log-file' ])
3838 else :
39- monkeypatch .setattr (sys , 'argv' , [ sys .argv [0 ],'-c' , 'ceph_devstack/resources/test/test_config.yaml ' , 'logs' ])
39+ monkeypatch .setattr (sys , 'argv' , [ sys .argv [0 ],'-c' , 'ceph_devstack/resources/test/test_config.toml ' , 'logs' ])
4040 monkeypatch .setattr ('builtins.input' , lambda name : str (selection ))
4141 data_path = '/tmp/ceph-devstack'
4242 try :
4343 os .makedirs (data_path + '/archive' , exist_ok = True )
4444 except Exception as e :
4545 logger .error (f"Error creating directory: { e } " )
46- return 1
46+ exit ( 1 )
4747 runs_dir = {}
4848 if num_runs > 0 :
4949 for i in range (num_runs ):
@@ -55,37 +55,37 @@ def test_teuthology_logs(num_runs:int,num_jobs:int,selection:int, flag_set:bool,
5555 os .makedirs (data_path + '/archive' + '/root-' + random_date + '-teuthology' , exist_ok = True )
5656 except Exception as e :
5757 logger .error (f"Error creating directory: { e } " )
58- return 1
58+ exit ( 1 )
5959 random_logs = []
6060 if num_jobs > 0 :
6161 for j in range (num_jobs ):
6262 try :
6363 os .makedirs (data_path + '/archive' + '/root-' + random_date + '-teuthology/' + str (j ), exist_ok = True )
6464 except Exception as e :
6565 logger .error (f"Error creating directory: { e } " )
66- return 1
66+ exit ( 1 )
6767 if teuthology_file_present :
6868 try :
6969 with open (data_path + '/archive' + '/root-' + random_date + '-teuthology/' + str (j )+ '/teuthology.log' , 'w' ) as f :
7070 random_logs .append ('' .join (random .choices (string .ascii_letters , k = 200 )))
7171 f .write (random_logs [- 1 ])
7272 except Exception as e :
7373 logger .error (f"Error creating file: { e } " )
74- return 1
74+ exit ( 1 )
7575 runs_dir [data_path + '/archive' + '/root-' + random_date + '-teuthology' ]= random_logs
7676 try :
7777 with pytest .raises (SystemExit ) as main_exit :
7878 main ()
7979 except Exception as e :
8080 logger .error (f"Error running main: { e } " )
81- return 1
81+ exit ( 1 )
8282
8383 output , err = capsys .readouterr ()
8484 try :
8585 shutil .rmtree (data_path + '/archive' )
8686 except Exception as e :
8787 logger .error (f"Error removing directory: { e } " )
88- return 1
88+ exit ( 1 )
8989
9090 runs_dir_list = list (runs_dir .keys ())
9191 if num_runs > 0 :
0 commit comments