Commit 089ce483 authored by Devon Carew's avatar Devon Carew

Merge pull request #2427 from devoncarew/fix_mac_test

fix a mac test
parents e2a6b488 c1caa269
...@@ -128,7 +128,10 @@ All done! In order to run your application, type: ...@@ -128,7 +128,10 @@ All done! In order to run your application, type:
void _renderTemplates(String projectName, String dirPath, void _renderTemplates(String projectName, String dirPath,
String flutterPackagesDirectory, { bool renderDriverTest: false }) { String flutterPackagesDirectory, { bool renderDriverTest: false }) {
String relativeFlutterPackagesDirectory = path.relative(flutterPackagesDirectory, from: dirPath); String relativePackagesDirectory = path.relative(
flutterPackagesDirectory,
from: path.join(dirPath, 'pubspec.yaml')
);
printStatus('Creating project ${path.basename(projectName)}:'); printStatus('Creating project ${path.basename(projectName)}:');
...@@ -139,7 +142,7 @@ All done! In order to run your application, type: ...@@ -139,7 +142,7 @@ All done! In order to run your application, type:
'androidIdentifier': _createAndroidIdentifier(projectName), 'androidIdentifier': _createAndroidIdentifier(projectName),
'iosIdentifier': _createUTIIdentifier(projectName), 'iosIdentifier': _createUTIIdentifier(projectName),
'description': description, 'description': description,
'flutterPackagesDirectory': relativeFlutterPackagesDirectory, 'flutterPackagesDirectory': relativePackagesDirectory,
'androidMinApiLevel': android.minApiLevel 'androidMinApiLevel': android.minApiLevel
}; };
......
...@@ -27,11 +27,6 @@ defineTests() { ...@@ -27,11 +27,6 @@ defineTests() {
temp.deleteSync(recursive: true); temp.deleteSync(recursive: true);
}); });
// This test consistently times out on our windows bot. The code is already
// covered on the linux one.
// Also fails on mac, with create --out returning '69'
// TODO(devoncarew): https://github.com/flutter/flutter/issues/1709
if (Platform.isLinux) {
// Verify that we create a project that is well-formed. // Verify that we create a project that is well-formed.
testUsingContext('flutter-simple', () async { testUsingContext('flutter-simple', () async {
ArtifactStore.flutterRoot = '../..'; ArtifactStore.flutterRoot = '../..';
...@@ -55,6 +50,5 @@ defineTests() { ...@@ -55,6 +50,5 @@ defineTests() {
}, },
// This test can take a while due to network requests. // This test can take a while due to network requests.
timeout: new Timeout(new Duration(minutes: 2))); timeout: new Timeout(new Duration(minutes: 2)));
}
}); });
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment