firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a mac test

Browse Source
This commit is contained in:
Devon Carew 2016-03-04 13:10:51 -08:00
parent e2a6b48803
commit c1caa26989
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter_tools/lib/src/commands/create.dart
View File

@ -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:
'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
}; };

6
packages/flutter_tools/test/create_test.dart
View File

@ -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() {
}, },
// 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)));
}
}); });
} }