Merge pull request #269 from pycom/small-patch

Small-patch

Author: Jakob Rosenberg

src/Watcher/scripts.js

@@ -19,21 +19,28 @@ const scripts = {
       `    if sys.modules[name].__file__ in ${JSON.stringify(modulesToDelete)}:`,
       '      print("[dev] Clear module: " + sys.modules[name].__file__)',
       "      del sys.modules[name]",
+
       "try:",
       "  print('[dev] Import boot.py')",
       "  import boot",
-      "except ImportError:",
-      "  print('[dev] No boot.py found. Skipped.')",
-      "except Exception:",
-      "  print('[dev] Exception in boot.py')",
-      "  raise",
+      "except KeyboardInterrupt: pass",
+      "except Exception as e:",
+      "  if(str(e) == \"no module named 'boot'\"):",
+      "    print('[dev] No boot.py found. Skipped.')",
+      "  else:",
+      "    print('[dev] Could not import boot.py.')",
+      "    raise e",
+
       "try:",
       "  print('[dev] Import main.py')",
       "  import main",
       "except KeyboardInterrupt: pass",
-      "except ImportError:",
-      "  print('[dev] No main.py found. Skipped.')",
-      "except Exception as e: raise e;",
+      "except Exception as e:",
+      "  if(str(e) == \"no module named 'main'\"):",
+      "    print('[dev] No main.py found. Skipped.')",
+      "  else:",
+      "    print('[dev] Could not import main.py.')",
+      "    raise e",
       "",
     ]
       .filter(Boolean)

src/utils/Notifier.js

@@ -90,7 +90,9 @@ class Notifier {
     if (shouldStoreChoice === this.DONT_ASK_AGAIN) choice = this.DONT_ASK_AGAIN;
     if (shouldStoreChoice) {
       const config = this.pymakr.config.get().get("misc.notifications");
-      this.pymakr.config.get().update(`misc.notifications`, { ...config, [id]: choice });
+      this.pymakr.config
+        .get()
+        .update(`misc.notifications`, { ...config, [id]: choice }, vscode.ConfigurationTarget.Global);
     }
   }
 

test/suite/integration/devmode.adv.test.js

@@ -62,16 +62,29 @@ test("can fake deepsleep in devmode", async () => {
     });
 
     test("machine.sleep gets transformed to fake_machine.sleep", async () => {
-      writeFileSync(
-        projectPath1 + "/main.py",
-        ["import machine", "# machine.sleep(100)", "# machine.deepSleep(100)", 'print("booted")'].join("\n")
-      );
-      await readUntil("booted");
-      const result = await device.adapter.getFile("main.py");
-      assert.equal(
-        result.toString(),
-        ["import fake_machine", "# fake_machine.sleep(100)", "# fake_machine.sleep(100)", 'print("booted")'].join("\n")
-      );
+      test("can write main.py", async () => {
+        writeFileSync(
+          projectPath1 + "/main.py",
+          ["import machine", "# machine.sleep(100)", "# machine.deepSleep(100)", 'print("booted")'].join("\n")
+        );
+        await readUntil("booted");
+      });
+      test("can read main.py", async () => {
+        const result = await device.adapter.getFile("main.py");
+        assert.equal(
+          result.toString(),
+          ["import fake_machine", "# fake_machine.sleep(100)", "# fake_machine.sleep(100)", 'print("booted")'].join(
+            "\n"
+          )
+        );
+      });
+    });
+
+    test("can stop devMode", async () => {
+      await pymakr.commands.stopDevMode({ project });
+      assert(!project.watcher.active);
+      assert.equal(project.watcher.deviceManagers.length, 0);
+      await new Promise((resolve) => setTimeout(resolve, 100));
     });
 
     // todo can't interrupt loop. needs fix

test/suite/integration/devmode.basic.test.js

@@ -58,6 +58,10 @@ test("can use devmode", async () => {
     writeFileSync(projectPath1 + "/main.py", 'print("hello world again again")');
     await new Promise((resolve) => device.readUntil("hello world again again", resolve));
   });
+  test('bad code in main.py is printed correctly"', async () => {
+    writeFileSync(projectPath1 + "/main.py", "bad code");
+    await new Promise((resolve) => device.readUntil("SyntaxError: invalid syntax", resolve));
+  });
   test("can stop devMode", async () => {
     await pymakr.commands.stopDevMode({ project });
     assert(!project.watcher.active);

test/suite/integration/probs.config.js

@@ -9,6 +9,7 @@ const PROJECT_STORE_TIMEOUT = 10000;
  */
 const prepDevice = async (device) => {
   device.adapter.__proxyMeta.clearQueue();
+  device.adapter.__proxyMeta.skipCurrent();
   console.log("[PREP] Waiting for idle...");
   await device.adapter.__proxyMeta.idle;
   await device.connect();
@@ -26,7 +27,8 @@ const prepDevice = async (device) => {
 };
 
 module.exports = {
-  async setupFile() {
+  async setupFile(file) {
+    console.log("[PREP]", file);
     resetFixture(workspaceDir);
     /** @type {PyMakr} */
     let pymakr;