Corrected Smoke test failure for 'Run Python File In Terminal' (#4809)

Kartik Raj · web-flow · commit 17f964715d71 · 2019-03-19T23:24:38.000-07:00
* Correct Smoke test failure for 'Run Python File In Terminal'

* news entry

* Run smoke tests on CI

* Catch errors and continue execution

* correct CI

* Corrected build number and install

* CI

* Code review
diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml
@@ -413,9 +413,10 @@ steps:
   # > npm run package
   # > npx gulp clean:cleanExceptTests
   # > npm run testSmoke
-  - script: |
+  - bash: |
+      npm install -g vsce
       npm run clean
-      npm run updateBuildNumber -- --buildNumber $TRAVIS_BUILD_NUMBER
+      npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID
       npm run package
       npx gulp clean:cleanExceptTests
       npm run testSmoke
diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml
@@ -50,7 +50,7 @@ jobs:
       'Mac-Py3.7 Unit+Single':
         PythonVersion: '3.7'
         VMImageName: 'macos-10.13'
-        TestsToRun: 'testUnitTests, pythonUnitTests, testSingleWorkspace'
+        TestsToRun: 'testUnitTests, pythonUnitTests, testSingleWorkspace, testSmoke'
         NeedsPythonTestReqs: true
       'Mac-Py2.7 Unit+Single':
         PythonVersion: '2.7'
@@ -60,7 +60,7 @@ jobs:
       'Linux-Py3.7 Unit+Single':
         PythonVersion: '3.7'
         VMImageName: 'ubuntu-16.04'
-        TestsToRun: 'testUnitTests, pythonUnitTests, testSingleWorkspace'
+        TestsToRun: 'testUnitTests, pythonUnitTests, testSingleWorkspace, testSmoke'
         NeedsPythonTestReqs: true
       'Linux-Py2.7 Unit+Single':
         PythonVersion: '2.7'
diff --git a/news/3 Code Health/4515.md b/news/3 Code Health/4515.md
@@ -0,0 +1 @@
+Corrected Smoke test failure for 'Run Python File In Terminal'
diff --git a/src/test/smoke/runInTerminal.smoke.test.ts b/src/test/smoke/runInTerminal.smoke.test.ts
@@ -43,7 +43,7 @@ suite('Smoke Test: Run Python File In Terminal', () => {
         }
         const textDocument = await openFile(file);
 
-        await vscode.commands.executeCommand<void>('python.execInTerminal', textDocument.uri, outputFile);
+        await vscode.commands.executeCommand<void>('python.execInTerminal', textDocument.uri);
         const checkIfFileHasBeenCreated = () => fs.pathExists(outputFile);
         await waitForCondition(checkIfFileHasBeenCreated, 30_000, `"${outputFile}" file not created`);
     });
diff --git a/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py b/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py
@@ -3,11 +3,14 @@
 import os
 
 optlist, args = getopt.getopt(sys.argv, '')
-if len(args) < 2:
-    help_msg = '{} requires 1 parameter - the full path specification of the logfile to write.'.format(args[0])
-    raise RuntimeError(help_msg)
-    
-log_file = args[1]
+
+# If the caller has not specified the output file, create one for them with
+# the same name as the caller script, but with a .log extension.
+log_file = os.path.splitext(sys.argv[0])[0] + '.log'
+
+# If the output file is given, use that instead.
+if len(args) == 2:
+    log_file = args[1]
 
 with open(log_file, "a") as f:
     f.write(sys.executable)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Corrected Smoke test failure for 'Run Python File In Terminal'`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ suite('Smoke Test: Run Python File In Terminal', () => {`
`43`	`43`	`}`
`44`	`44`	`const textDocument = await openFile(file);`
`45`	`45`
`46`		`- await vscode.commands.executeCommand<void>('python.execInTerminal', textDocument.uri, outputFile);`
	`46`	`+ await vscode.commands.executeCommand<void>('python.execInTerminal', textDocument.uri);`
`47`	`47`	`const checkIfFileHasBeenCreated = () => fs.pathExists(outputFile);`
`48`	`48`	await waitForCondition(checkIfFileHasBeenCreated, 30_000, `"${outputFile}" file not created`);
`49`	`49`	`});`