From 8b721a27efdd6e91f6d38bc5bf53129456a63f60 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 7 Feb 2020 11:22:24 +0530 Subject: [PATCH] functional-tests: Move Disable tests to the end Disabling an application at the end of test suite frees us system resources for the remaining applications. Signed-off-by: Joseph Nuthalapati Reviewed-by: Sunil Mohan Adapa --- functional_tests/features/gitweb.feature | 10 +++++----- functional_tests/features/samba.feature | 10 +++++----- functional_tests/features/searx.feature | 9 ++++----- functional_tests/features/upgrades.feature | 16 ++++++++-------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/functional_tests/features/gitweb.feature b/functional_tests/features/gitweb.feature index 833a69fde..5f3be943b 100644 --- a/functional_tests/features/gitweb.feature +++ b/functional_tests/features/gitweb.feature @@ -42,11 +42,6 @@ Scenario: Backup and restore gitweb Then the repository should be restored And the gitweb site should be available -Scenario: Disable gitweb application - Given the gitweb application is enabled - When I disable the gitweb application - Then the gitweb site should not be available - Scenario: Public gitweb site shows only public repositories Given the gitweb application is enabled And both public and private repositories exist @@ -90,3 +85,8 @@ Scenario: Access private repository with git client And the repository should not be publicly writable And the repository should be privately readable And the repository should be privately writable + +Scenario: Disable gitweb application + Given the gitweb application is enabled + When I disable the gitweb application + Then the gitweb site should not be available diff --git a/functional_tests/features/samba.feature b/functional_tests/features/samba.feature index 9ff767d47..1b5aaf7b9 100644 --- a/functional_tests/features/samba.feature +++ b/functional_tests/features/samba.feature @@ -14,11 +14,6 @@ Scenario: Enable samba application When I enable the samba application Then the samba service should be running -Scenario: Disable samba application - Given the samba application is enabled - When I disable the samba application - Then the samba service should not be running - Scenario: Enable open samba share Given the samba application is enabled When I enable the open samba share @@ -50,3 +45,8 @@ Scenario: Backup and restore samba And I restore the samba app data backup Then the samba service should be running And I can write to the home samba share + +Scenario: Disable samba application + Given the samba application is enabled + When I disable the samba application + Then the samba service should not be running diff --git a/functional_tests/features/searx.feature b/functional_tests/features/searx.feature index ca95cbac1..735981ada 100644 --- a/functional_tests/features/searx.feature +++ b/functional_tests/features/searx.feature @@ -19,11 +19,6 @@ Scenario: Backup and restore searx And I restore the searx app data backup Then the searx site should be available -Scenario: Disable searx application - Given the searx application is enabled - When I disable the searx application - Then the searx site should not be available - Scenario: Enable public access Given the searx application is enabled When I enable public access in searx @@ -47,3 +42,7 @@ Scenario: Preserve public access setting Then searx app should be visible on the front page And the searx site should be available +Scenario: Disable searx application + Given the searx application is enabled + When I disable the searx application + Then the searx site should not be available diff --git a/functional_tests/features/upgrades.feature b/functional_tests/features/upgrades.feature index f46c0ea1f..ff8551c3c 100644 --- a/functional_tests/features/upgrades.feature +++ b/functional_tests/features/upgrades.feature @@ -7,10 +7,10 @@ Feature: Software Upgrades Background: Given I'm a logged in user -Scenario: Disable automatic upgrades - Given automatic upgrades are enabled - When I disable automatic upgrades - Then automatic upgrades should be disabled +Scenario: Enable automatic upgrades + Given automatic upgrades are disabled + When I enable automatic upgrades + Then automatic upgrades should be enabled Scenario: Backup and restore upgrades When I enable automatic upgrades @@ -19,7 +19,7 @@ Scenario: Backup and restore upgrades And I restore the upgrades app data backup Then automatic upgrades should be enabled -Scenario: Enable automatic upgrades - Given automatic upgrades are disabled - When I enable automatic upgrades - Then automatic upgrades should be enabled +Scenario: Disable automatic upgrades + Given automatic upgrades are enabled + When I disable automatic upgrades + Then automatic upgrades should be disabled