Check for browsers in verifyOptions, so the script fails early.
This commit is contained in:
		
							parent
							
								
									8a369b7876
								
							
						
					
					
						commit
						9ca7cbdc73
					
				| @ -37,6 +37,8 @@ class TestOptions(OptionParser): | ||||
|             options.manifestFile = DEFAULT_MANIFEST_FILE | ||||
|         if options.browser and options.browserManifestFile: | ||||
|             print "Warning: ignoring browser argument since manifest file was also supplied" | ||||
|         if not options.browser and not options.browserManifestFile: | ||||
|             self.error("No test browsers found. Use --browserManifest or --browser args.") | ||||
|         return options | ||||
|          | ||||
| def prompt(question): | ||||
| @ -219,10 +221,9 @@ def setUp(options): | ||||
|     if options.browserManifestFile: | ||||
|         testBrowsers = makeBrowserCommands(options.browserManifestFile) | ||||
|     elif options.browser: | ||||
|         testBrowsers = [BrowserCommand({"path":options.browser, "name":"firefox"})]  | ||||
|     else: | ||||
|         print "No test browsers found. Use --browserManifest or --browser args." | ||||
|                | ||||
|         testBrowsers = [BrowserCommand({"path":options.browser, "name":"firefox"})] | ||||
|     assert len(testBrowsers) > 0 | ||||
| 
 | ||||
|     with open(options.manifestFile) as mf: | ||||
|         manifestList = json.load(mf) | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user