Merge eb96d97567 into 22210ca352
				
					
				
			This commit is contained in:
		
						commit
						a0a55c4878
					
				
							
								
								
									
										21
									
								
								speedtest.py
								
								
								
								
							
							
						
						
									
										21
									
								
								speedtest.py
								
								
								
								
							| 
						 | 
					@ -1979,12 +1979,21 @@ def shell():
 | 
				
			||||||
        results.share()
 | 
					        results.share()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if args.simple:
 | 
					    if args.simple:
 | 
				
			||||||
        printer('Ping: %s ms\nDownload: %0.2f M%s/s\nUpload: %0.2f M%s/s' %
 | 
					        printer('Ping: %s ms' % results.ping)
 | 
				
			||||||
                (results.ping,
 | 
					
 | 
				
			||||||
                 (results.download / 1000.0 / 1000.0) / args.units[1],
 | 
					        if args.download:
 | 
				
			||||||
                 args.units[0],
 | 
					            printer('Download: %0.2f M%s/s' %
 | 
				
			||||||
                 (results.upload / 1000.0 / 1000.0) / args.units[1],
 | 
					                    ((results.download / 1000.0 / 1000.0) / args.units[1],
 | 
				
			||||||
                 args.units[0]))
 | 
					                     args.units[0]))
 | 
				
			||||||
 | 
					        else:
 | 
				
			||||||
 | 
					            printer('Skipping download test')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if args.upload:
 | 
				
			||||||
 | 
					            printer('Upload: %0.2f M%s/s' %
 | 
				
			||||||
 | 
					                    ((results.upload / 1000.0 / 1000.0) / args.units[1],
 | 
				
			||||||
 | 
					                     args.units[0]))
 | 
				
			||||||
 | 
					        else:
 | 
				
			||||||
 | 
					            printer('Skipping upload test')
 | 
				
			||||||
    elif args.csv:
 | 
					    elif args.csv:
 | 
				
			||||||
        printer(results.csv(delimiter=args.csv_delimiter))
 | 
					        printer(results.csv(delimiter=args.csv_delimiter))
 | 
				
			||||||
    elif args.json:
 | 
					    elif args.json:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue