Merge branch 'next-staging' into next

Author: jakobrosenberg

package-lock.json

@@ -143,7 +143,7 @@ class DeviceManager {
   async hardRestartDevice(modulesToDelete) {
     this.log.log("hard restart device");
     await this.device.runScript(`\rprint("[dev] \'${modulesToDelete[0]}\' changed. Restarting... ")\r`);
-    this.device.reset();
+    await this.device.reset();
   }
 
   async softRestartDevice(modulesToDelete) {

src/Watcher/DeviceManager.js

@@ -41,11 +41,11 @@ test("can fake deepsleep in devmode", async () => {
     await readUntil("uploading Pymakr devtools");
     await readUntil("patching boot.dev");
     await readUntil("changed. Restarting...");
-    await readUntil(">>>");
-    await readUntil(">>>");
     console.log("after reset");
-
+    // todo test only works when run alone
     test("sys.path includes _pymakr_dev", async () => {
+      await readUntil(">>>");
+      await readUntil(">>>");
       console.log("before sys check");
       const result = await device.runScript("import sys\nprint(sys.path)");
       assert(result.match(/\/_pymakr_dev/), "did not find _pymakr_dev. Found: " + result.toString());

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

@@ -8,8 +8,9 @@ const PROJECT_STORE_TIMEOUT = 10000;
  * @param {Device} device
  */
 const prepDevice = async (device) => {
+  device.adapter.__proxyMeta.clearQueue();
+  await device.adapter.__proxyMeta.idle;
   await device.connect();
-
   await pymakr.commands.safeBootDevice({ device });
   // TODO timeout here should not be required. High priority!
   await new Promise((resolve) => setTimeout(resolve, 500));