@@ -34,16 +34,16 @@ def test_teuthology_logs(num_runs:int,num_jobs:int,selection:int, flag_set:bool,
34
34
logger = logging .getLogger (__name__ )
35
35
36
36
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' ])
38
38
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' ])
40
40
monkeypatch .setattr ('builtins.input' , lambda name : str (selection ))
41
41
data_path = '/tmp/ceph-devstack'
42
42
try :
43
43
os .makedirs (data_path + '/archive' , exist_ok = True )
44
44
except Exception as e :
45
45
logger .error (f"Error creating directory: { e } " )
46
- return 1
46
+ exit ( 1 )
47
47
runs_dir = {}
48
48
if num_runs > 0 :
49
49
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,
55
55
os .makedirs (data_path + '/archive' + '/root-' + random_date + '-teuthology' , exist_ok = True )
56
56
except Exception as e :
57
57
logger .error (f"Error creating directory: { e } " )
58
- return 1
58
+ exit ( 1 )
59
59
random_logs = []
60
60
if num_jobs > 0 :
61
61
for j in range (num_jobs ):
62
62
try :
63
63
os .makedirs (data_path + '/archive' + '/root-' + random_date + '-teuthology/' + str (j ), exist_ok = True )
64
64
except Exception as e :
65
65
logger .error (f"Error creating directory: { e } " )
66
- return 1
66
+ exit ( 1 )
67
67
if teuthology_file_present :
68
68
try :
69
69
with open (data_path + '/archive' + '/root-' + random_date + '-teuthology/' + str (j )+ '/teuthology.log' , 'w' ) as f :
70
70
random_logs .append ('' .join (random .choices (string .ascii_letters , k = 200 )))
71
71
f .write (random_logs [- 1 ])
72
72
except Exception as e :
73
73
logger .error (f"Error creating file: { e } " )
74
- return 1
74
+ exit ( 1 )
75
75
runs_dir [data_path + '/archive' + '/root-' + random_date + '-teuthology' ]= random_logs
76
76
try :
77
77
with pytest .raises (SystemExit ) as main_exit :
78
78
main ()
79
79
except Exception as e :
80
80
logger .error (f"Error running main: { e } " )
81
- return 1
81
+ exit ( 1 )
82
82
83
83
output , err = capsys .readouterr ()
84
84
try :
85
85
shutil .rmtree (data_path + '/archive' )
86
86
except Exception as e :
87
87
logger .error (f"Error removing directory: { e } " )
88
- return 1
88
+ exit ( 1 )
89
89
90
90
runs_dir_list = list (runs_dir .keys ())
91
91
if num_runs > 0 :
0 commit comments