From eecb63943ff7df2f096781ad0b6ca25314e75849 Mon Sep 17 00:00:00 2001 From: Sylvain Joyeux Date: Wed, 28 Mar 2018 17:16:01 -0300 Subject: [PATCH] features: apply the no-clobber tag to the whole features This ensures that one doesn't create a new scenario and forgets it ... (No, no, it never happened ... ever) --- features/01 - Basics/01 - Getting Started.feature | 8 ++------ features/01 - Basics/02 - Compositions.feature | 6 ++---- .../01 - Basics/03 - Constant Generator.feature | 10 ++-------- .../01 - Basics/04 - Profiles and Devices.feature | 6 +++--- features/01 - Basics/05 - Deployment.feature | 10 ++-------- features/01 - Basics/06 - Validation.feature | 4 ++-- features/01 - Basics/07 - Publishing.feature | 14 ++------------ 7 files changed, 15 insertions(+), 43 deletions(-) diff --git a/features/01 - Basics/01 - Getting Started.feature b/features/01 - Basics/01 - Getting Started.feature index c0efa42..4b78870 100644 --- a/features/01 - Basics/01 - Getting Started.feature +++ b/features/01 - Basics/01 - Getting Started.feature @@ -1,6 +1,6 @@ +@disable-bundler +@no-clobber Feature: 01. Getting Started - @disable-bundler - @no-clobber Scenario: 01. Creating the bundle Given I cd to "dev" And within the workspace, I successfully run the following script: @@ -27,8 +27,6 @@ Feature: 01. Getting Started When I stop the command started last Then the exit status should be 0 - @disable-bundler - @no-clobber Scenario: 02. Setting up the scene Given I cd to "dev/bundles/syskit_basics" And a file named "scenes/empty_world/empty_world.world" with: @@ -58,8 +56,6 @@ Feature: 01. Getting Started rock-gazebo --download-only empty_world """ - @disable-bundler - @no-clobber Scenario: 03. Preparing the gazebo Syskit configuration Given I cd to "dev/bundles/syskit_basics" Then I successfully run the following script: diff --git a/features/01 - Basics/02 - Compositions.feature b/features/01 - Basics/02 - Compositions.feature index ad74f7b..7512412 100644 --- a/features/01 - Basics/02 - Compositions.feature +++ b/features/01 - Basics/02 - Compositions.feature @@ -1,6 +1,6 @@ +@disable-bundler +@no-clobber Feature: 02. Compositions - @disable-bundler - @no-clobber Scenario: 01. Installing the necessary packages Given I cd to "dev" And I modify the file "autoproj/manifest" with: @@ -15,8 +15,6 @@ Feature: 02. Compositions amake --all """ - @disable-bundler - @no-clobber Scenario: 02. Using the installed component Given I cd to "dev/bundles/syskit_basics" And within the workspace, I successfully run the following script: diff --git a/features/01 - Basics/03 - Constant Generator.feature b/features/01 - Basics/03 - Constant Generator.feature index af502b8..8e8cefb 100644 --- a/features/01 - Basics/03 - Constant Generator.feature +++ b/features/01 - Basics/03 - Constant Generator.feature @@ -1,6 +1,6 @@ +@disable-bundler +@no-clobber Feature: 03. Constant Generator - @disable-bundler - @no-clobber Scenario: 01. The Cartesian Command Generator Given I cd to "dev/bundles/syskit_basics" And within the workspace, I successfully run the following script: @@ -58,8 +58,6 @@ Feature: 03. Constant Generator """ Then the file "models/compositions/arm_cartesian_constant_command_generator.rb" is valid for Syskit - @disable-bundler - @no-clobber Scenario: 02. Testing Given I cd to "dev/bundles/syskit_basics" @@ -160,8 +158,6 @@ Feature: 03. Constant Generator syskit test -rgazebo test/compositions/test_arm_cartesian_constant_command_generator.rb """ - @disable-bundler - @no-clobber Scenario: 03. Creating the ArmCartesianConstantControlWdls Composition Given I cd to "dev/bundles/syskit_basics" And within the workspace, I successfully run the following script: @@ -218,8 +214,6 @@ Feature: 03. Constant Generator syskit test -r gazebo test/compositions/test_arm_cartesian_constant_control_wdls.rb """ - @disable-bundler - @no-clobber Scenario: 04. The Joint Position Constant Generator Given I cd to "dev/bundles/syskit_basics" And within the workspace, I successfully run the following script: diff --git a/features/01 - Basics/04 - Profiles and Devices.feature b/features/01 - Basics/04 - Profiles and Devices.feature index 3313541..fb0ff91 100644 --- a/features/01 - Basics/04 - Profiles and Devices.feature +++ b/features/01 - Basics/04 - Profiles and Devices.feature @@ -1,6 +1,6 @@ +@disable-bundler +@no-clobber Feature: 04. Profiles and Devices - @disable-bundler - @no-clobber Scenario: 01. Defining Devices for the Gazebo System Given I cd to "dev/bundles/syskit_basics" When within the workspace, I successfully run the following script: @@ -73,4 +73,4 @@ Feature: 04. Profiles and Devices """ Then the file "models/profiles/gazebo/base.rb" is valid for Syskit in configuration "gazebo" - \ No newline at end of file + diff --git a/features/01 - Basics/05 - Deployment.feature b/features/01 - Basics/05 - Deployment.feature index 4b9fc1e..0376688 100644 --- a/features/01 - Basics/05 - Deployment.feature +++ b/features/01 - Basics/05 - Deployment.feature @@ -1,9 +1,9 @@ +@disable-bundler +@no-clobber Feature: 05. Deployment Background: Given I cd to "dev/bundles/syskit_basics" - @disable-bundler - @no-clobber Scenario: 01. Component Deployment When I modify the file "config/robots/gazebo.rb" with: """ @@ -23,8 +23,6 @@ Feature: 05. Deployment """ Then the "gazebo" configuration is valid for Syskit - @disable-bundler - @no-clobber Scenario: 02. Static configuration of oroGen components When within the workspace, I successfully run the following script: """ @@ -73,8 +71,6 @@ Feature: 05. Deployment """ Then the "gazebo" configuration is valid for Syskit - @disable-bundler - @no-clobber Scenario: 03. Dynamic and system-wide configuration When I modify the file "models/compositions/arm_cartesian_constant_control_wdls.rb" with: """ @@ -156,8 +152,6 @@ Feature: 05. Deployment """ Then the "gazebo" configuration is valid for Syskit - @disable-bundler - @no-clobber Scenario: 04. Building the system's action interface When I modify the file "config/robots/gazebo.rb" with: """ diff --git a/features/01 - Basics/06 - Validation.feature b/features/01 - Basics/06 - Validation.feature index d7278f4..ce6bbe3 100644 --- a/features/01 - Basics/06 - Validation.feature +++ b/features/01 - Basics/06 - Validation.feature @@ -1,9 +1,9 @@ +@disable-bundler +@no-clobber Feature: 06. Validation Background: Given I cd to "dev/bundles/syskit_basics" - @disable-bundler - @no-clobber Scenario: 01. Validating Configuration Consistency When I modify the file "models/orogen/cart_ctrl_wdls.rb" with: """ diff --git a/features/01 - Basics/07 - Publishing.feature b/features/01 - Basics/07 - Publishing.feature index b99bf6b..60a9349 100644 --- a/features/01 - Basics/07 - Publishing.feature +++ b/features/01 - Basics/07 - Publishing.feature @@ -1,8 +1,8 @@ +@disable-bundler +@no-clobber Feature: 07. Publishing As a new Rock/Syskit user, I intend to learn how to integrate a new package. - @disable-bundler - @no-clobber @clobber-git @clobber-new_package_set Scenario: 01. Push the bundle @@ -29,8 +29,6 @@ Feature: 07. Publishing """ Then I push "master" to "bundles-syskit_basics" - @disable-bundler - @no-clobber Scenario: 02. Creating the new build configuration Given a git repository "rock.rock_and_syskit-buildconf" And I cd to "dev/autoproj" @@ -49,8 +47,6 @@ Feature: 07. Publishing And I stop the command started last Then the exit status should be 0 - @disable-bundler - @no-clobber Scenario: 03. Creating the new package set Given a git repository "rock.rock_and_syskit-package_set" And a directory named "new_package_set" @@ -67,8 +63,6 @@ Feature: 07. Publishing """ And I push "master" to "rock.rock_and_syskit-package_set" - @disable-bundler - @no-clobber Scenario: 04. Adding the package set to the build Given I cd to "dev" When I modify the file "autoproj/manifest" with: @@ -85,8 +79,6 @@ Feature: 07. Publishing aup --config """ - @disable-bundler - @no-clobber Scenario: 05. Defining the package Given I cd to "dev/autoproj/remotes/rock.rock_and_syskit" And I append to "packages.autobuild" with: @@ -106,8 +98,6 @@ Feature: 07. Publishing aup -n syskit_basics """ - @disable-bundler - @no-clobber Scenario: 06. Removing the control packages Given I cd to "dev" When I modify the file "autoproj/manifest" with: