TBR mojo/v23proxy: Sleep between runs and more printouts
I doubt this will solve the problem, but it might.
The root of the problem seems to be Mojo Shell's.
See https://github.com/vanadium/issues/issues/1226 discussion
Change-Id: I044768fbca95344b2174b89cf6ba42130ce07c02
diff --git a/Makefile b/Makefile
index 2b19e30..395671a 100644
--- a/Makefile
+++ b/Makefile
@@ -130,8 +130,11 @@
.PHONY: test-integration
test-integration: mock packages $(BUILD_DIR)/test_client.mojo $(BUILD_DIR)/test_server.mojo $(BUILD_DIR)/v23clientproxy.mojo $(BUILD_DIR)/v23serverproxy.mojo
GOPATH=$(PWD)/go:$(PWD)/gen/go jiri go -profiles=v23:base,$(MOJO_PROFILE) run go/src/v.io/x/mojo/tests/cmd/runtest.go || ($(MAKE) unmock && exit 1)
+ sleep 10
GOPATH=$(PWD)/go:$(PWD)/gen/go jiri go -profiles=v23:base,v23:dart,$(MOJO_PROFILE) run go/src/v.io/x/mojo/tests/cmd/runtest.go -client dart || ($(MAKE) unmock && exit 1)
+ sleep 10
GOPATH=$(PWD)/go:$(PWD)/gen/go jiri go -profiles=v23:base,v23:dart,$(MOJO_PROFILE) run go/src/v.io/x/mojo/tests/cmd/runtest.go -server dart || ($(MAKE) unmock && exit 1)
+ sleep 10
GOPATH=$(PWD)/go:$(PWD)/gen/go jiri go -profiles=v23:base,v23:dart,$(MOJO_PROFILE) run go/src/v.io/x/mojo/tests/cmd/runtest.go -client dart -server dart || ($(MAKE) unmock && exit 1)
$(MAKE) unmock
diff --git a/dart-tests/end_to_end_test/lib/client.dart b/dart-tests/end_to_end_test/lib/client.dart
index 23945de..11879e5 100644
--- a/dart-tests/end_to_end_test/lib/client.dart
+++ b/dart-tests/end_to_end_test/lib/client.dart
@@ -18,20 +18,21 @@
EndToEndTestClient.fromHandle(MojoHandle handle) : super.fromHandle(handle);
void initialize(List<String> args, String url) {
+ print("Starting the End To End Test...");
run(args, url);
}
Future testSimple() async {
- print ("Running Test Simple...");
+ print("Running Test Simple...");
V23ProxyTestSimpleResponseParams response = await testProxy.ptr.simple(SimpleRequestA);
if (response.value != SimpleResponseValue) {
throw "expected $SimpleResponseValue, but got ${response.value}";
}
- print ("Completed Test Simple! OK");
+ print("Completed Test Simple! OK");
}
Future testMultiArgs() async {
- print ("Running Test MultiArgs...");
+ print("Running Test MultiArgs...");
V23ProxyTestMultiArgsResponseParams response1 = await testProxy.ptr.multiArgs(MultiArgsRequestA, MultiArgsRequestB, MultiArgsRequestC, MultiArgsRequestD);
if (response1.x.toString() != MultiArgsResponseX.toString()) { // compare strings since this is a union
throw "expected $MultiArgsResponseX, but got ${response1.x}";
@@ -39,29 +40,29 @@
if (response1.y != MultiArgsResponseY) {
throw "expected $MultiArgsResponseY, but got ${response1.y}";
}
- print ("Completed Test MultiArgs! OK");
+ print("Completed Test MultiArgs! OK");
}
Future testNoOutArgs() async {
- print ("Running Test NoOutArgs...");
+ print("Running Test NoOutArgs...");
String expectedMessage = "message-for-no-return";
V23ProxyTestNoOutArgsPutResponseParams _ = await testProxy.ptr.noOutArgsPut(expectedMessage);
V23ProxyTestFetchMsgFromNoOutArgsPutResponseParams response3 = await testProxy.ptr.fetchMsgFromNoOutArgsPut();
if (response3.storedMsg != expectedMessage) {
throw "expected $expectedMessage, but got ${response3.storedMsg}";
}
- print ("Completed Test NoOutArgs! OK");
+ print("Completed Test NoOutArgs! OK");
}
Future benchmarkSimple() async {
- print ("Running Benchmark Simple...");
+ print("Running Benchmark Simple...");
int benchmarkN = 100;
DateTime start = new DateTime.now();
for (int i = 0; i < benchmarkN; i++) {
await testProxy.ptr.simple(SimpleRequestA);
}
DateTime end = new DateTime.now();
- print ("Completed Benchmark Simple! OK");
+ print("Completed Benchmark Simple! OK");
// Print how long the benchmark took, somewhat mimicking what it would look like in Go.
print(" $benchmarkN\t ${(end.difference(start).inMicroseconds * 1000 / benchmarkN).floor()} ns/op");
diff --git a/dart-tests/end_to_end_test/lib/server.dart b/dart-tests/end_to_end_test/lib/server.dart
index b579efa..b2e0595 100644
--- a/dart-tests/end_to_end_test/lib/server.dart
+++ b/dart-tests/end_to_end_test/lib/server.dart
@@ -18,6 +18,7 @@
Application _application; // This isn't needed, is it...?
V23ProxyTestImpl(this._application, MojoMessagePipeEndpoint endpoint) {
+ print("Creating the v23proxy test impl.");
_stub = new V23ProxyTestStub.fromEndpoint(endpoint, this);
}
@@ -79,6 +80,7 @@
@override
void acceptConnection(String requestorUrl, String resolvedUrl,
ApplicationConnection connection) {
+ print("Server: Accepting a connection from ${requestorUrl} to ${resolvedUrl}");
connection.provideService(V23ProxyTest.serviceName,
(endpoint) => new V23ProxyTestImpl(this, endpoint),
description: V23ProxyTestStub.serviceDescription);