Basic check for QubesOS in runtime tests and to avoid starting LAN server
This commit is contained in:
		
							parent
							
								
									87b8655b83
								
							
						
					
					
						commit
						8389ed190c
					
				
					 3 changed files with 7 additions and 3 deletions
				
			
		|  | @ -67,8 +67,8 @@ MOTD_SIGN_KEY = "TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ" | ||||||
| """Public key that signs update notifications.""" | """Public key that signs update notifications.""" | ||||||
| UPDATE_SIGN_KEY = "TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ" | UPDATE_SIGN_KEY = "TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ" | ||||||
| 
 | 
 | ||||||
| platform = platform.system() | pf = platform.system() | ||||||
| if platform == 'Windows': | if pf == 'Windows': | ||||||
|     SCRIPT_NAME = 'run-windows.bat' |     SCRIPT_NAME = 'run-windows.bat' | ||||||
| else: | else: | ||||||
|     if os.path.exists(filepaths.daemon_mark_file): |     if os.path.exists(filepaths.daemon_mark_file): | ||||||
|  |  | ||||||
|  | @ -7,8 +7,12 @@ from gevent import sleep | ||||||
| from coredb import blockmetadb | from coredb import blockmetadb | ||||||
| from onionrutils.epoch import get_epoch | from onionrutils.epoch import get_epoch | ||||||
| import logger | import logger | ||||||
|  | from etc import onionrvalues | ||||||
| 
 | 
 | ||||||
| def test_lan_server(testmanager): | def test_lan_server(testmanager): | ||||||
|  |     if onionrvalues.IS_QUBES: | ||||||
|  |         logger.warn("Cannot test LAN on QubesOS", terminal=True) | ||||||
|  |         return | ||||||
|     start_time = get_epoch() |     start_time = get_epoch() | ||||||
|     for i in range(1337, 1340): |     for i in range(1337, 1340): | ||||||
|         try: |         try: | ||||||
|  |  | ||||||
|  | @ -1 +1 @@ | ||||||
| 1593561863 | 1597039738 | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue