Fix Failing Tests

Ensure Hot Code Push and Package Tests account for possible multiple runs.

tools/tests/apps/hot-code-push-test/.meteor/packages

@@ -4,5 +4,5 @@
 # but you can also edit it by hand.
 
 meteor-base
-blaze-html-templates
+static-html 
 session

tools/tests/hot-code-push.js

@@ -220,6 +220,9 @@ my-package`);
     run.match("jsVar: undefined");
     run.match("packageVar: bar");
 
+    // Ensure we set back to foo for subsequent runs
+    s.write("packages/my-package/foo.js", "packageVar = 'foo'");
+
     // Add appcache and ensure that the browser still reloads.
     s.write(".meteor/packages", `meteor-base
 session
@@ -243,6 +246,7 @@ appcache`);
 
     // Remove appcache and ensure that the browser still reloads.
     s.write(".meteor/packages", `meteor-base
+    static-html
 session`);
     run.match(/appcache.*removed from your project/);
     run.match("server restarted");

tools/tests/package-tests.js

@@ -358,8 +358,8 @@ selftest.define("add packages client archs", function (options) {
     outerRun.expectExit(0);
     checkPackages(s, ["meteor-base", "say-something-client-targets"]);
 
-    var expectedLogNum = 0;
     s.testWithAllClients(function (run) {
+      var expectedLogNum = 0;
       run.waitSecs(5);
       run.match("myapp");
       run.match("proxy");