fix rebase

CHANGELOG.md

@@ -21,7 +21,6 @@
     o don't allow `--test-plan` together with `--users`, `--startup-time`, `--hatch-rate`, `--run-time`, `--no-reset-metrics`, `--manager` and `--worker`
     o internal `AttackPhase`s renamed: `Starting` -> `Increase`, `Running` -> `Maintain`, `Stopping` -> `Decrease`
  - [#449](https://github.com/tag1consulting/goose/pull/449) **API change**: rename `GooseTaskSet` -> `Scenario`, `GooseTask` -> `Transaction`, `GooseTaskResult` -> `TransationResult`, `GooseTaskEror` -> `TransactionError`, `WeightedGooseTasks` -> `WeightedTransactions`, `GooseTaskFunction` -> `TransactionFunction`, `test_start_task` -> `test_start_transaction`, `test_stop_task` -> `test_stop_transaction`, `register_task` -> `register_transaction`, `task!` -> `transaction!`, `--no-task-metrics` -> `--no-transaction-metrics`, `GooseTaskError` -> `TransactionError`
- - []() add support for variable speed and multiple decrease AttackPhases
  - [#450](https://github.com/tag1consulting/goose/pull/450) add support for variable speed and multiple decrease AttackPhases
 
 ## 0.15.2 December 13, 2021

src/goose.rs

@@ -2494,10 +2494,10 @@ impl<'a> GooseRequestBuilder<'a> {
     /// ```rust
     /// use goose::prelude::*;
     ///
-    /// let mut a_task = transaction!(task_function);
+    /// let mut a_transaction = transaction!(transaction_function);
     ///
     /// // Make a named request.
-    /// async fn task_function(user: &mut GooseUser) -> TransactionResult {
+    /// async fn transaction_function(user: &mut GooseUser) -> TransactionResult {
     ///     // Manually create a GooseRequestBuilder object.
     ///     let goose_request = GooseRequest::builder()
     ///         // Set a relative path to request.

src/lib.rs

@@ -1406,8 +1406,6 @@ impl GooseAttack {
                 None
             };
 
-                //// Copy the appropriate scenario into the thread.
-                //let thread_scenario = self.scenarios[thread_user.scenarios_index].clone();
             // Copy the GooseUser-to-parent sender channel, used by all threads.
             thread_user.channel_to_parent =
                 Some(goose_attack_run_state.all_threads_metrics_tx.clone());

tests/defaults.rs

@@ -161,10 +161,6 @@ fn validate_test(
 
             // Requests are made while GooseUsers are increasing or maintaining.
             // Verify that the test ran as long as it was supposed to.
-            eprintln!(
-                "duration: {}, TEST_PLAN_RUN_TIME: {}",
-                goose_metrics.duration, TEST_PLAN_RUN_TIME
-            );
             assert!(goose_metrics.duration == TEST_PLAN_RUN_TIME);
 
             // Be sure there were no more requests made than the throttle should allow.
@@ -733,7 +729,7 @@ async fn test_defaults_no_metrics() {
 
     // Confirm that we did not track metrics.
     assert!(goose_metrics.requests.is_empty());
-    assert!(goose_metrics.tasks.is_empty());
+    assert!(goose_metrics.transactions.is_empty());
     assert!(goose_metrics.total_users == USERS);
     assert!(goose_metrics.duration == RUN_TIME);
 }