Skip to content

Commit f9a9398

Browse files
authored
Enable remaining Windows suppressed tests (#722)
1 parent 32b9f8e commit f9a9398

File tree

8 files changed

+26
-19
lines changed

8 files changed

+26
-19
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
env: PKGS="dwds"
4141
script: ./tool/travis.sh test_0
4242
- stage: unit_test
43-
name: "SDK: stable; PKG: dwds; TASKS: `pub run test`"
43+
name: "SDK: stable; PKG: dwds; TASKS: `pub run test -j 1`"
4444
dart: stable
4545
os: windows
4646
env: PKGS="dwds"

dwds/lib/src/debugging/sources.dart

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9+
import 'package:http/http.dart';
910
import 'package:logging/logging.dart';
1011
import 'package:path/path.dart' as p;
1112
import 'package:source_maps/source_maps.dart';
@@ -157,10 +158,18 @@ class Sources {
157158
/// [HttpStatus.ok].
158159
Future<String> _readAssetOrNull(String path) async {
159160
var response = await _assetHandler.getRelativeAsset(path);
160-
if (response.statusCode == HttpStatus.ok) {
161-
return response.readAsString();
161+
var responseText = '';
162+
var hasError = false;
163+
try {
164+
responseText = await response.readAsString();
165+
} on ClientException {
166+
hasError = true;
167+
responseText = '<response not available>';
162168
}
163-
_logWriter(Level.WARNING, '''
169+
if (response.statusCode == HttpStatus.ok && !hasError) {
170+
return responseText;
171+
} else {
172+
_logWriter(Level.WARNING, '''
164173
Failed to load asset at path: $path.
165174
166175
Status code: ${response.statusCode}
@@ -169,9 +178,10 @@ Headers:
169178
${const JsonEncoder.withIndent(' ').convert(response.headers)}
170179
171180
Content:
172-
${await response.readAsString()}
181+
$responseText}
173182
''');
174-
return null;
183+
return null;
184+
}
175185
}
176186

177187
/// The source map for a DDC-compiled JS [script].

dwds/test/chrome_proxy_service_test.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,15 @@ void main() {
126126
1: 2,
127127
false: true,
128128
};
129+
129130
var result =
130131
await service.callServiceExtension(serviceMethod, args: args);
131132
expect(
132133
result.json,
133134
args.map((k, v) => MapEntry(k is String ? k : jsonEncode(k),
134135
v is String ? v : jsonEncode(v))));
136+
}, onPlatform: {
137+
'windows': const Skip('https://github.com/dart-lang/webdev/issues/711'),
135138
});
136139

137140
test('failure', () async {
@@ -149,6 +152,8 @@ void main() {
149152
error is RPCError &&
150153
error.code == -32001 &&
151154
error.details == jsonEncode(errorDetails))));
155+
}, onPlatform: {
156+
'windows': const Skip('https://github.com/dart-lang/webdev/issues/711'),
152157
});
153158
});
154159

dwds/test/debug_service_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
@TestOn('vm')
6-
@OnPlatform({
7-
'windows': Skip('https://github.com/dart-lang/webdev/issues/711'),
8-
})
96
import 'dart:io';
107

118
import 'package:test/test.dart';

dwds/test/devtools_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
@Timeout(Duration(minutes: 5))
66
@TestOn('vm')
7-
@OnPlatform({
8-
'windows': Skip('https://github.com/dart-lang/webdev/issues/711'),
9-
})
107
import 'package:test/test.dart';
118
import 'package:webdriver/io.dart';
129

dwds/test/fixtures/context.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,11 @@ class TestContext {
185185
.any((result) => result.status == BuildStatus.succeeded));
186186

187187
// Allow change to propagate to the browser.
188-
await Future.delayed(const Duration(seconds: 2));
188+
// Windows, or at least Travis on Windows, seems to need more time.
189+
var delay = Platform.isWindows
190+
? const Duration(seconds: 5)
191+
: const Duration(seconds: 2);
192+
await Future.delayed(delay);
189193
}
190194

191195
Future<ChromeTab> _fetchDartDebugExtensionTab(

dwds/test/refresh_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
/// Tests that require a fresh context to run, and can interfere with other
66
/// tests.
77
@TestOn('vm')
8-
@OnPlatform({
9-
'windows': Skip('https://github.com/dart-lang/webdev/issues/711'),
10-
})
118
library refresh_test;
129

1310
import 'dart:async';

dwds/test/reload_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
@TestOn('vm')
66
@Timeout(Duration(minutes: 5))
7-
@OnPlatform({
8-
'windows': Skip('https://github.com/dart-lang/webdev/issues/711'),
9-
})
107

118
import 'package:dwds/dwds.dart';
129
import 'package:test/test.dart';

0 commit comments

Comments
 (0)