aboutsummaryrefslogtreecommitdiff
path: root/Foundation
diff options
context:
space:
mode:
authorGravatar dmaclach <dmaclach@gmail.com>2018-11-13 12:03:42 -0800
committerGravatar GitHub <noreply@github.com>2018-11-13 12:03:42 -0800
commit32cf585ff11679352506cabab4426e8daafd5ed1 (patch)
tree1e501c99c83e7f8d6be5d5b0b588698a48e0a396 /Foundation
parent1ecebbcaccd95ad0f60d5f67685867a26b505b3e (diff)
Remove flaky "clean environment" check. (#193)
This check is very flaky from OS version to OS version and whether or not you are running under the debugger.
Diffstat (limited to 'Foundation')
-rw-r--r--Foundation/GTMScriptRunnerTest.m27
1 files changed, 2 insertions, 25 deletions
diff --git a/Foundation/GTMScriptRunnerTest.m b/Foundation/GTMScriptRunnerTest.m
index 5f52e61..9b154f2 100644
--- a/Foundation/GTMScriptRunnerTest.m
+++ b/Foundation/GTMScriptRunnerTest.m
@@ -199,35 +199,12 @@
[sr setEnvironment:newEnv];
output = [sr run:@"/usr/bin/env | wc -l" standardError:&error];
XCTAssertEqual([output intValue], numVars + 1,
- @"should have one more env var now. StdErr %@", error);
+ @"should have one more env var now. StdErr %@", error);
[sr setEnvironment:nil];
output = [sr run:@"/usr/bin/env | wc -l" standardError:&error];
XCTAssertEqual([output intValue], numVars,
- @"should be back down to %d vars. StdErr:%@", numVars, error);
-
- NSMutableDictionary *currVars
- = [[[[NSProcessInfo processInfo] environment] mutableCopy] autorelease];
-
- // When debugging a release build _ was not in the processInfo environment
- // causing the assert below to fail. Not sure why, but it appeared
- // to be harmless, and easy to account for.
- [currVars setObject:@"/usr/bin/env" forKey:@"_"];
- [sr setEnvironment:currVars];
-
- // Account for the shell level.
- [currVars setObject:@"1" forKey:@"SHLVL"];
-
- // Xcode inserts DYLD_FRAMEWORK_PATH and DYLD_LIBRARY_PATH when running XCTests,
- // but that doesn't get passed on when running the script.
- [currVars removeObjectForKey:@"DYLD_FRAMEWORK_PATH"];
- [currVars removeObjectForKey:@"DYLD_LIBRARY_PATH"];
-
- output = [sr run:@"/usr/bin/env | /usr/bin/sort" standardError:&error];
- NSArray *lineArray = [output componentsSeparatedByString:@"\n"];
- XCTAssertEqual([lineArray count], [currVars count],
- @"StdErr:%@\nCurrentEnvironment:\n%@\nExpected environment:\n%@",
- error, output, currVars);
+ @"should be back down to %d vars. StdErr:%@", numVars, error);
}
- (void)testDescription {