@@ -25,16 +25,15 @@ use self::executor::{CliExecutionError, CliExecutor, ProcessCli};
2525
2626pub use scenarios:: {
2727 FILE_TRANSFER_GIT_FILTERING_SCENARIO , FILE_TRANSFER_PATH_SAFETY_SCENARIO ,
28- FILE_TRANSFER_ROUND_TRIP_SCENARIO , FILE_TRANSFER_SCENARIO , MECHANISTIC_PROPOSAL_SCENARIO ,
28+ FILE_TRANSFER_ROUND_TRIP_SCENARIO , MECHANISTIC_PROPOSAL_SCENARIO ,
2929 NEW_HOSTNAME_PROPOSAL_SCENARIO , POLICY_LOCAL_SCENARIO , SANDBOX_LIFECYCLE_SCENARIO ,
3030 SMOKE_SCENARIO ,
3131} ;
3232
33- /// An installed conformance scenario.
33+ /// A portable conformance scenario exercised by the Cargo test suite .
3434#[ derive( Debug ) ]
3535pub struct Scenario {
3636 pub name : & ' static str ,
37- pub description : & ' static str ,
3837 run : for <' a > fn ( & ' a mut OpenShellRunner ) -> ScenarioFuture < ' a > ,
3938}
4039
@@ -46,25 +45,6 @@ impl Scenario {
4645 }
4746}
4847
49- const SCENARIOS : & [ Scenario ] = & [
50- SMOKE_SCENARIO ,
51- SANDBOX_LIFECYCLE_SCENARIO ,
52- FILE_TRANSFER_SCENARIO ,
53- MECHANISTIC_PROPOSAL_SCENARIO ,
54- NEW_HOSTNAME_PROPOSAL_SCENARIO ,
55- POLICY_LOCAL_SCENARIO ,
56- ] ;
57-
58- /// Returns every scenario compiled into this distribution.
59- pub fn scenarios ( ) -> & ' static [ Scenario ] {
60- SCENARIOS
61- }
62-
63- /// Finds a scenario by its stable command-line name.
64- pub fn scenario ( name : & str ) -> Option < & ' static Scenario > {
65- scenarios ( ) . iter ( ) . find ( |candidate| candidate. name == name)
66- }
67-
6848const CLEANUP_TIMEOUT : Duration = Duration :: from_mins ( 2 ) ;
6949pub const STATUS_TIMEOUT : Duration = Duration :: from_secs ( 30 ) ;
7050const GATEWAY_STATUS_ATTEMPT_TIMEOUT : Duration = Duration :: from_secs ( 10 ) ;
@@ -281,13 +261,6 @@ pub struct OpenShellCommand<'a> {
281261}
282262
283263impl OpenShellRunner {
284- pub fn new ( scenario : & str ) -> Result < Self , RunnerError > {
285- Ok ( Self :: with_executor (
286- Arc :: new ( ProcessCli :: new ( PathBuf :: from ( "openshell" ) ) ) ,
287- scenario,
288- ) )
289- }
290-
291264 /// Uses an explicit `openshell` binary rather than resolving it on `PATH`.
292265 pub fn with_binary ( binary : PathBuf , scenario : & str ) -> Result < Self , RunnerError > {
293266 if !binary. is_file ( ) {
@@ -335,10 +308,6 @@ impl OpenShellRunner {
335308 & self . run_id
336309 }
337310
338- pub fn scenario ( & self ) -> & str {
339- & self . scenario
340- }
341-
342311 pub fn step ( & self , step : impl Into < String > ) -> CommandStep < ' _ > {
343312 CommandStep {
344313 runner : self ,
@@ -871,7 +840,6 @@ mod tests {
871840 let ( mut runner, _cli) = test_runner ( Vec :: new ( ) ) ;
872841
873842 assert_eq ! ( runner. id( ) . len( ) , 10 ) ;
874- assert_eq ! ( runner. scenario( ) , "smoke" ) ;
875843 runner. finished = true ;
876844 }
877845
0 commit comments