Make test-packages actually run again meteor#6470

tmeasday · tmeasday · commit 3a98d04b710e · 2016-03-12T14:06:37.000+11:00
diff --git a/packages/meteor/test_environment.js b/packages/meteor/test_environment.js
@@ -7,12 +7,14 @@ if (Meteor.isClient) {
 
 var TEST_METADATA = JSON.parse(TEST_METADATA_STR || "{}");
 
+// Note that if we are in test-packages mode neither of these will be set,
+// but we will have a test driver package
 Meteor.isTest = !!TEST_METADATA.isTest;
 Meteor.isAppTest = !!TEST_METADATA.isAppTest;
 
-if (Meteor.isTest || Meteor.isAppTest) {
+var testDriverPackageName = TEST_METADATA.driverPackage;
+if (testDriverPackageName) {
   Meteor.startup(function() {
-    var testDriverPackageName = TEST_METADATA.driverPackage;
     if (typeof testDriverPackageName !== "string") {
       throw new Error("No --driver-package specified for `meteor test`");
     }
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
@@ -1048,31 +1048,3 @@ export var fullLink = Profile("linker.fullLink", function (inputFiles, {
     }
   });
 });
-
-function getTestPreamble() {
-  const testDriverPackageName = global.testCommandMetadata.driverPackage;
-
-  let setMeteorTest = "";
-  if (global.testCommandMetadata.isTest) {
-    setMeteorTest = "Package.meteor.Meteor.isTest = true;";
-  } else if (global.testCommandMetadata.isAppTest) {
-    setMeteorTest = "Package.meteor.Meteor.isAppTest = true;";
-  }
-
-  return `\
-${setMeteorTest}
-
-if (Package.meteor.Meteor.isClient) {
-  Package.meteor.Meteor.startup(function() {
-    var testDriverPackage = Package[\"${testDriverPackageName}\"];
-    if (!testDriverPackage) {
-      throw new Error(\"Can\'t find test driver package: ${testDriverPackageName}\");
-    }
-
-    if (!testDriverPackage.runTests) {
-      throw new Error("Test driver package ${testDriverPackageName} missing \`runTests\` export");
-    }
-    testDriverPackage.runTests();
-  });
-}`;
-}
