Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: utils/tests/pub/test_pub.dart

Issue 11276042: Explicitly configure git committer. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Respond to review. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « utils/pub/io.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/tests/pub/test_pub.dart
diff --git a/utils/tests/pub/test_pub.dart b/utils/tests/pub/test_pub.dart
index 8c8dd80330eab28902c85afff729250d9fd4ab74..063a016d9b72c91233aaa77305402a57e4212c20 100644
--- a/utils/tests/pub/test_pub.dart
+++ b/utils/tests/pub/test_pub.dart
@@ -536,9 +536,10 @@ void schedulePub({List<String> args, Pattern output, Pattern error,
['--enable-type-checks', '--enable-asserts', pubPath, '--trace'];
dartArgs.addAll(args);
- var environment = new Map.from(Platform.environment);
- environment['PUB_CACHE'] = pathInSandbox(cachePath);
- environment['DART_SDK'] = pathInSandbox(sdkPath);
+ var environment = {
+ 'PUB_CACHE': pathInSandbox(cachePath),
+ 'DART_SDK': pathInSandbox(sdkPath)
+ };
return runProcess(dartBin, dartArgs, workingDir: pathInSandbox(appPath),
environment: environment);
@@ -1050,16 +1051,20 @@ class GitRepoDescriptor extends DirectoryDescriptor {
return super.create(parentDir).chain((rootDir) {
workingDir = rootDir;
- return writeTextFile(join(parentDir, '.gitconfig'), '''
-[user]
- name = Test Pub
- email = pub@dartlang.org
-''');
- }).chain(runGitStep);
+ return runGitStep(null);
+ });
}
Future<String> _runGit(List<String> args, Directory workingDir) {
- return runGit(args, workingDir: workingDir.path).transform((result) {
+ // Explicitly specify the committer information. Git needs this to commit
+ // and we don't want to rely on the buildbots having this already set up.
+ var environment = {
+ 'GIT_COMMITTER_NAME': 'Pub Test',
+ 'GIT_COMMITTER_EMAIL': 'pub@dartlang.org'
+ };
+
+ return runGit(args, workingDir: workingDir.path,
+ environment: environment).transform((result) {
if (!result.success) {
throw "Error running: git ${Strings.join(args, ' ')}\n"
"${Strings.join(result.stderr, '\n')}";
« no previous file with comments | « utils/pub/io.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698