no e2e feature, and don't assume 'cargo run' is a good default

This commit is contained in:
James Wilson
2021-07-13 11:12:23 +01:00
parent 66bf24dc4d
commit faedba87d4
7 changed files with 68 additions and 80 deletions
+17 -16
View File
@@ -1,17 +1,22 @@
//! These only run when the "e2e" feature is set (eg `cargo test --features e2e`).
//! The rust IDE plugins may behave better if you comment out this line during development:
#![cfg(feature = "e2e")]
use test_utils::{feed_message_de::{ FeedMessage, NodeDetails }, server::Server, assert_contains_matches};
use test_utils::{
feed_message_de::{ FeedMessage, NodeDetails },
server::{ self, Server },
assert_contains_matches
};
use serde_json::json;
use std::time::Duration;
use common::node_types::{ BlockHash };
async fn cargo_run_server() -> Server {
Server::start(server::StartOpts {
shard_command: server::cargo_run_commands::telemetry_shard().expect("valid shard command"),
core_command: server::cargo_run_commands::telemetry_core().expect("valid core command")
}).await.unwrap()
}
#[tokio::test]
async fn feed_sent_version_on_connect() {
let server = Server::start_default()
.await
.expect("server could start");
let server = cargo_run_server().await;
// Connect a feed:
let (_feed_tx, mut feed_rx) = server.get_core().connect().await.unwrap();
@@ -26,9 +31,7 @@ async fn feed_sent_version_on_connect() {
#[tokio::test]
async fn feed_ping_responded_to_with_pong() {
let server = Server::start_default()
.await
.expect("server could start");
let server = cargo_run_server().await;
// Connect a feed:
let (mut feed_tx, mut feed_rx) = server.get_core().connect().await.unwrap();
@@ -47,7 +50,7 @@ async fn feed_ping_responded_to_with_pong() {
#[tokio::test]
async fn feed_add_and_remove_node() {
// Connect server and add shard
let mut server = Server::start_default().await.unwrap();
let mut server = cargo_run_server().await;
let shard_id = server.add_shard().await.unwrap();
// Connect a node to the shard:
@@ -109,9 +112,7 @@ async fn feed_add_and_remove_node() {
#[tokio::test]
async fn feed_add_and_remove_shard() {
let mut server = Server::start_default()
.await
.expect("server could start");
let mut server = cargo_run_server().await;
let mut shards = vec![];
for id in 1 ..= 2 {
@@ -192,7 +193,7 @@ async fn feed_can_subscribe_and_unsubscribe_from_chain() {
use FeedMessage::*;
// Start server, add shard, connect node:
let mut server = Server::start_default().await.unwrap();
let mut server = cargo_run_server().await;
let shard_id = server.add_shard().await.unwrap();
let (mut node_tx, _node_rx) = server.get_shard(shard_id).unwrap().connect().await.unwrap();