Deleted
Added
conftest.py (1864:755e40af8e1f) | conftest.py (1868:999775550850) |
---|---|
1import fcntl 2import inspect 3import json 4import os 5import platform 6import re 7import shutil 8import signal --- 341 unchanged lines hidden (view full) --- 350 ps = _fds_check[name] 351 ps_pid = ps['pid'] 352 ps['pid'] = pid_by_name(ps['name']) 353 354 if not ps['skip']: 355 fds_diff = waitforfds(lambda: _count_fds(ps['pid']) - ps['fds']) 356 ps['fds'] += fds_diff 357 | 1import fcntl 2import inspect 3import json 4import os 5import platform 6import re 7import shutil 8import signal --- 341 unchanged lines hidden (view full) --- 350 ps = _fds_check[name] 351 ps_pid = ps['pid'] 352 ps['pid'] = pid_by_name(ps['name']) 353 354 if not ps['skip']: 355 fds_diff = waitforfds(lambda: _count_fds(ps['pid']) - ps['fds']) 356 ps['fds'] += fds_diff 357 |
358 assert ps['pid'] == ps_pid, 'same pid %s' % name | 358 if not option.restart: 359 assert ps['pid'] == ps_pid, 'same pid %s' % name 360 |
359 assert fds_diff <= option.fds_threshold, ( 360 'descriptors leak %s' % name 361 ) 362 363 else: 364 ps['fds'] = _count_fds(ps['pid']) 365 366 # print unit.log in case of error --- 201 unchanged lines hidden (view full) --- 568 return len(os.listdir(procfile)) 569 570 try: 571 out = subprocess.check_output( 572 ['procstat', '-f', pid], stderr=subprocess.STDOUT, 573 ).decode() 574 return len(out.splitlines()) 575 | 361 assert fds_diff <= option.fds_threshold, ( 362 'descriptors leak %s' % name 363 ) 364 365 else: 366 ps['fds'] = _count_fds(ps['pid']) 367 368 # print unit.log in case of error --- 201 unchanged lines hidden (view full) --- 570 return len(os.listdir(procfile)) 571 572 try: 573 out = subprocess.check_output( 574 ['procstat', '-f', pid], stderr=subprocess.STDOUT, 575 ).decode() 576 return len(out.splitlines()) 577 |
576 except (FileNotFoundError, subprocess.CalledProcessError): | 578 except (FileNotFoundError, TypeError, subprocess.CalledProcessError): |
577 pass 578 579 try: 580 out = subprocess.check_output( 581 ['lsof', '-n', '-p', pid], stderr=subprocess.STDOUT, 582 ).decode() 583 return len(out.splitlines()) 584 | 579 pass 580 581 try: 582 out = subprocess.check_output( 583 ['lsof', '-n', '-p', pid], stderr=subprocess.STDOUT, 584 ).decode() 585 return len(out.splitlines()) 586 |
585 except (FileNotFoundError, subprocess.CalledProcessError): | 587 except (FileNotFoundError, TypeError, subprocess.CalledProcessError): |
586 pass 587 588 return 0 589 590 591def run_process(target, *args): 592 global _processes 593 --- 76 unchanged lines hidden (view full) --- 670 671 option.restart = True 672 673 unit_stop() 674 675 public_dir(option.cache_dir) 676 shutil.rmtree(option.cache_dir) 677 | 588 pass 589 590 return 0 591 592 593def run_process(target, *args): 594 global _processes 595 --- 76 unchanged lines hidden (view full) --- 672 673 option.restart = True 674 675 unit_stop() 676 677 public_dir(option.cache_dir) 678 shutil.rmtree(option.cache_dir) 679 |
678 if not option.save_log: | 680 if not option.save_log and os.path.isdir(option.temp_dir): |
679 public_dir(option.temp_dir) 680 shutil.rmtree(option.temp_dir) | 681 public_dir(option.temp_dir) 682 shutil.rmtree(option.temp_dir) |